]> The Tcpdump Group git mirrors - libpcap/commitdiff
Use PCAP_ERRBUF_SIZE as the size of pcap_strerror()'s internal buffer.
authorGuy Harris <[email protected]>
Fri, 12 Aug 2016 00:56:42 +0000 (17:56 -0700)
committerGuy Harris <[email protected]>
Fri, 12 Aug 2016 00:56:42 +0000 (17:56 -0700)
PCAP_BUF_SIZE isn't always defined; PCAP_ERRBUF_SIZE is.

pcap.c

diff --git a/pcap.c b/pcap.c
index 3541084eea7fa9fe42de3436733dbee10d8afb2e..7edd7d848b03eb83b679387faaa80e2c9f8566a4 100644 (file)
--- a/pcap.c
+++ b/pcap.c
@@ -1625,24 +1625,24 @@ pcap_strerror(int errnum)
 {
 #ifdef HAVE_STRERROR
 #ifdef _WIN32
-       static char errbuf[PCAP_BUF_SIZE];
+       static char errbuf[PCAP_ERRBUF_SIZE];
        errno_t errno;
-       errno = strerror_s(errbuf, PCAP_BUF_SIZE, errnum);
+       errno = strerror_s(errbuf, PCAP_ERRBUF_SIZE, errnum);
        if (errno != 0) /* errno = 0 if successful */
-               strlcpy(errbuf, "strerror_s() error", PCAP_BUF_SIZE);
-       return errbuf;
+               strlcpy(errbuf, "strerror_s() error", PCAP_ERRBUF_SIZE);
+       return (errbuf);
 #else
        return (strerror(errnum));
 #endif /* _WIN32 */
 #else
        extern int sys_nerr;
        extern const char *const sys_errlist[];
-       static char ebuf[15+10+1];
+       static char errbuf[PCAP_ERRBUF_SIZE];
 
        if ((unsigned int)errnum < sys_nerr)
                return ((char *)sys_errlist[errnum]);
-       (void)pcap_snprintf(ebuf, sizeof ebuf, "Unknown error: %d", errnum);
-       return(ebuf);
+       (void)pcap_snprintf(errbuf, sizeof errbuf, "Unknown error: %d", errnum);
+       return (errbuf);
 #endif
 }