CHANGES: Add a change backported to 4.99

[tcpdump] / print-lisp.c

diff --git a/print-lisp.c b/print-lisp.c
index 379bffbbbdf4cf0e9e9bfe699fa824e6cb561713..fc2006f4cb8a9cd260288cc6739bde070558f0f7 100644 (file)
--- a/print-lisp.c
+++ b/print-lisp.c
@@ -100,7 +100,6 @@
 
 #include "netdissect-stdinc.h"
 #include "netdissect.h"
 
 #include "netdissect-stdinc.h"
 #include "netdissect.h"

-#include <stdlib.h>

 
 #include "ip.h"
 #include "ip6.h"
 
 #include "ip.h"
 #include "ip6.h"


@@ -130,12 +129,12 @@ enum {
 };
 
 static const struct tok lisp_type [] = {
 };
 
 static const struct tok lisp_type [] = {

-       { 0, "LISP-Reserved"                    },
-       { 1, "LISP-Map-Request"                 },
-       { 2, "LISP-Map-Reply"                   },
-       { 3, "LISP-Map-Register"                },
-       { 4, "LISP-Map-Notify"                  },
-       { 8, "LISP-Encapsulated-Contol-Message" },
+       { 0, "LISP-Reserved"                     },
+       { 1, "LISP-Map-Request"                  },
+       { 2, "LISP-Map-Reply"                    },
+       { 3, "LISP-Map-Register"                 },
+       { 4, "LISP-Map-Notify"                   },
+       { 8, "LISP-Encapsulated-Control-Message" },

        { 0, NULL }
 };
 
        { 0, NULL }
 };
 


@@ -284,8 +283,8 @@ lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
                goto invalid;
 
        /* Print all the EID records */
                goto invalid;
 
        /* Print all the EID records */

-       while ((length > packet_offset) && (record_count--)) {
-
+       while ((length > packet_offset) && (record_count != 0)) {
+               record_count--;

                ND_TCHECK_LEN(packet_iterator + packet_offset,
                              MAP_REGISTER_EID_LEN);
                ND_PRINT("\n");
                ND_TCHECK_LEN(packet_iterator + packet_offset,
                              MAP_REGISTER_EID_LEN);
                ND_PRINT("\n");


@@ -327,7 +326,8 @@ lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
 
                ND_PRINT(" %u locator(s)", loc_count);
 
 
                ND_PRINT(" %u locator(s)", loc_count);
 

-               while (loc_count--) {
+               while (loc_count != 0) {
+                       loc_count--;

                        ND_TCHECK_LEN(packet_iterator + packet_offset,
                                      MAP_REGISTER_LOC_LEN);
                        lisp_loc = (const lisp_map_register_loc *) (packet_iterator + packet_offset);
                        ND_TCHECK_LEN(packet_iterator + packet_offset,
                                      MAP_REGISTER_LOC_LEN);
                        lisp_loc = (const lisp_map_register_loc *) (packet_iterator + packet_offset);