Changeset 18fa92c in rtems-libbsd for freebsd/contrib/tcpdump/print-radius.c

Timestamp:

08/20/18 13:53:03 (4 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, 5-freebsd-12, 6-freebsd-12, master

Children:

2df56db

Parents:

bb80d9d

git-author:

Sebastian Huber <sebastian.huber@…> (08/20/18 13:53:03)

git-committer:

Sebastian Huber <sebastian.huber@…> (09/21/18 08:29:39)

Message:

Update to FreeBSD head 2018-02-01

Git mirror commit d079ae0442af8fa3cfd6d7ede190d04e64a2c0d4.

Update #3472.

File:

• freebsd/contrib/tcpdump/print-radius.c (modified) (4 diffs)

freebsd/contrib/tcpdump/print-radius.c

@@ -503 +503 @@
       case TUNNEL_PASS:
            if (length < 3)
-           {
-              ND_PRINT((ndo, "%s", tstr));
-              return;
-           }
+              goto trunc;
            if (*data && (*data <=0x1F) )
               ND_PRINT((ndo, "Tag[%u] ", *data));
@@ -526 +523 @@
            {
               if (length < 1)
-              {
-                 ND_PRINT((ndo, "%s", tstr));
-                 return;
-              }
+                 goto trunc;
               if (*data)
                 ND_PRINT((ndo, "Tag[%u] ", *data));
@@ -539 +533 @@
         break;
       case EGRESS_VLAN_NAME:
+           if (length < 1)
+              goto trunc;
            ND_PRINT((ndo, "%s (0x%02x) ",
                   tok2str(rfc4675_tagged,"Unknown tag",*data),
@@ -547 +543 @@
    }
 
-   for (i=0; *data && i < length ; i++, data++)
+   for (i=0; i < length && *data; i++, data++)
        ND_PRINT((ndo, "%c", (*data < 32 || *data > 126) ? '.' : *data));