CVE-2017-13045/VQP: add some bounds checks

[tcpdump] / print-msdp.c

diff --git a/print-msdp.c b/print-msdp.c
index 878124355cd4687e7817c74e63bb95382f88b60e..50bafb0ae090bf60a5d95587abe24bf51437eab5 100644 (file)
--- a/print-msdp.c
+++ b/print-msdp.c
@@ -16,14 +16,15 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: Multicast Source Discovery Protocol (MSDP) printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
@@ -72,7 +73,7 @@ msdp_print(netdissect_options *ndo, const u_char *sp, u_int length)
                case 2:
                        ND_PRINT((ndo, " SA-Request"));
                        ND_TCHECK2(*sp, 5);
-                       ND_PRINT((ndo, " for %s", ipaddr_string(sp + 1)));
+                       ND_PRINT((ndo, " for %s", ipaddr_string(ndo, sp + 1)));
                        break;
                case 4:
                        ND_PRINT((ndo, " Keepalive"));