Bluetooth: Add some bounds and length checks

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index ddd5551d2e4dac110dd8f6ae35060c58cf4e3d37..f0505fe2a30e2ba4f22bf64785204fef64443ab7 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -779,7 +779,7 @@ MakeFilename(char *buffer, char *orig_name, int cnt, int max_chars)
        if (cnt == 0 && max_chars == 0)
                strncpy(buffer, filename, PATH_MAX + 1);
        else
        if (cnt == 0 && max_chars == 0)
                strncpy(buffer, filename, PATH_MAX + 1);
        else

-               if (snprintf(buffer, PATH_MAX + 1, "%s%0*d", filename, max_chars, cnt) > PATH_MAX)
+               if (nd_snprintf(buffer, PATH_MAX + 1, "%s%0*d", filename, max_chars, cnt) > PATH_MAX)

                   /* Report an error if the filename is too large */
                   error("too many output files or filename is too long (> %d)", PATH_MAX);
         free(filename);
                   /* Report an error if the filename is too large */
                   error("too many output files or filename is too long (> %d)", PATH_MAX);
         free(filename);


@@ -1198,7 +1198,7 @@ fprintf(stderr, "Opening %s\n", device);
                        /*
                         * Return an error for our caller to handle.
                         */
                        /*
                         * Return an error for our caller to handle.
                         */

-                       snprintf(ebuf, PCAP_ERRBUF_SIZE, "%s: %s\n(%s)",
+                       nd_snprintf(ebuf, PCAP_ERRBUF_SIZE, "%s: %s\n(%s)",

                            device, pcap_statustostr(status), cp);
                        pcap_close(pc);
                        return (NULL);
                            device, pcap_statustostr(status), cp);
                        pcap_close(pc);
                        return (NULL);


@@ -1212,7 +1212,7 @@ fprintf(stderr, "Opening %s\n", device);
                        char sysctl[32];
                        size_t s = sizeof(parent);
 
                        char sysctl[32];
                        size_t s = sizeof(parent);
 

-                       snprintf(sysctl, sizeof(sysctl),
+                       nd_snprintf(sysctl, sizeof(sysctl),

                            "net.wlan.%d.%%parent", atoi(device + 4));
                        sysctlbyname(sysctl, parent, &s, NULL, 0);
                        strlcpy(newdev, device, sizeof(newdev));
                            "net.wlan.%d.%%parent", atoi(device + 4));
                        sysctlbyname(sysctl, parent, &s, NULL, 0);
                        strlcpy(newdev, device, sizeof(newdev));


@@ -1327,7 +1327,7 @@ main(int argc, char **argv)
        /*
         * Initialize the netdissect code.
         */
        /*
         * Initialize the netdissect code.
         */

-       if (nd_init(ebuf, sizeof ebuf) == -1)
+       if (nd_init(ebuf, sizeof(ebuf)) == -1)

                error("%s", ebuf);
 
        memset(ndo, 0, sizeof(*ndo));
                error("%s", ebuf);
 
        memset(ndo, 0, sizeof(*ndo));


@@ -1346,10 +1346,13 @@ main(int argc, char **argv)
        else
                ndo->program_name = program_name = argv[0];
 
        else
                ndo->program_name = program_name = argv[0];
 

-#ifdef _WIN32
+#if defined(HAVE_PCAP_WSOCKINIT)

        if (pcap_wsockinit() != 0)
                error("Attempting to initialize Winsock failed");
        if (pcap_wsockinit() != 0)
                error("Attempting to initialize Winsock failed");

-#endif /* _WIN32 */
+#elif defined(HAVE_WSOCKINIT)
+       if (wsockinit() != 0)
+               error("Attempting to initialize Winsock failed");
+#endif

 
        /*
         * On platforms where the CPU doesn't support unaligned loads,
 
        /*
         * On platforms where the CPU doesn't support unaligned loads,


@@ -1525,7 +1528,7 @@ main(int argc, char **argv)
 
                case 'm':
                        if (nd_have_smi_support()) {
 
                case 'm':
                        if (nd_have_smi_support()) {

-                               if (nd_load_smi_module(optarg, ebuf, sizeof ebuf) == -1)
+                               if (nd_load_smi_module(optarg, ebuf, sizeof(ebuf)) == -1)

                                        error("%s", ebuf);
                        } else {
                                (void)fprintf(stderr, "%s: ignoring option `-m %s' ",
                                        error("%s", ebuf);
                        } else {
                                (void)fprintf(stderr, "%s: ignoring option `-m %s' ",