When using pcap_create_common() in pcap_fopen_offline(), leave

p->opt.source null, so that we don't try to free a constant string when
we close the pcap_t.

diff --git a/pcap.c b/pcap.c
index c9b461c46affcacaf7533f688e25b6d5dfa797af..1599d10b890e6dcf98a2eb2e23e8d22d8c3449d1 100644 (file)
--- a/pcap.c
+++ b/pcap.c
@@ -190,12 +190,14 @@ pcap_create_common(const char *source, char *ebuf)
        p->fd = -1;     /* not opened yet */
 #endif 
 
-       p->opt.source = strdup(source);
-       if (p->opt.source == NULL) {
-               snprintf(ebuf, PCAP_ERRBUF_SIZE, "malloc: %s",
-                   pcap_strerror(errno));
-               free(p);
-               return (NULL);
+       if (source != NULL) {
+               p->opt.source = strdup(source);
+               if (p->opt.source == NULL) {
+                       snprintf(ebuf, PCAP_ERRBUF_SIZE, "malloc: %s",
+                           pcap_strerror(errno));
+                       free(p);
+                       return (NULL);
+               }
        }
 
        /*

diff --git a/savefile.c b/savefile.c
index 67da51fd629f82f50e0b19088ba2b584a54415c8..b501b6a5cf039892f93ccfa6023c8ebd5211aaf3 100644 (file)
--- a/savefile.c
+++ b/savefile.c
@@ -1361,7 +1361,7 @@ pcap_fopen_offline(FILE *fp, char *errbuf)
        bpf_u_int32 magic;
        int linklen;
 
-       p = pcap_create_common("(savefile)", errbuf);
+       p = pcap_create_common(NULL, errbuf);
        if (p == NULL)
                return (NULL);