Fix: memory leak in pcap related functions (#1338)

greenbone · Feb 20, 2023 · b59f09b · b59f09b
1 parent a5b7c0f
commit b59f09b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/misc/bpf_share.c b/misc/bpf_share.c
@@ -85,12 +85,16 @@ bpf_open_live (char *iface, char *filter)
   if (ret == NULL)
     {
       g_message ("%s", errbuf);
+      if (alldevsp != NULL)
+        pcap_freealldevs (alldevsp);
       return -1;
     }
 
   if (pcap_lookupnet (iface, &network, &netmask, errbuf) < 0)
     {
       g_message ("pcap_lookupnet failed: %s", errbuf);
+      if (alldevsp != NULL)
+        pcap_freealldevs (alldevsp);
       pcap_close (ret);
       return -1;
     }
@@ -100,6 +104,8 @@ bpf_open_live (char *iface, char *filter)
       char buffer[2048];
       snprintf (buffer, sizeof (buffer), "pcap_compile: Filter \"%s\"", filter);
       print_pcap_error (ret, buffer);
+      if (alldevsp != NULL)
+        pcap_freealldevs (alldevsp);
       pcap_close (ret);
       return -1;
     }
@@ -114,6 +120,9 @@ bpf_open_live (char *iface, char *filter)
   if (pcap_setfilter (ret, &filter_prog) < 0)
     {
       print_pcap_error (ret, "pcap_setfilter\n");
+      if (alldevsp != NULL)
+        pcap_freealldevs (alldevsp);
+      pcap_freecode (&filter_prog);
       pcap_close (ret);
       return -1;
     }

diff --git a/nasl/nasl_packet_forgery.c b/nasl/nasl_packet_forgery.c
@@ -2547,6 +2547,8 @@ nasl_send_capture (lex_ctxt *lexic)
   if (bpf < 0)
     {
       nasl_perror (lexic, "pcap_next: Could not get a bpf\n");
+      if (alldevsp != NULL)
+        pcap_freealldevs (alldevsp);
       return NULL;
     }
   else
@@ -2615,6 +2617,8 @@ nasl_send_capture (lex_ctxt *lexic)
         }
       else
         {
+          if (alldevsp != NULL)
+            pcap_freealldevs (alldevsp);
           bpf_close (bpf);
           return NULL;
         }