Changeset 9f1b6ee

Timestamp:

08/09/10 10:11:56 (11 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

176646e

Parents:

a1e177d

Message:

• Let's be a bit more careful about freeing things in the event of error inside of format_linux.c

File:

• lib/format_linux.c (modified) (4 diffs)

lib/format_linux.c

@@ -175 +175 @@
                 trace_set_err(libtrace, errno, "Could not create raw socket");
                 free(libtrace->format_data);
+                libtrace->format_data = NULL;
                 return -1;
         }
@@ -187 +188 @@
                         trace_set_err(libtrace, TRACE_ERR_INIT_FAILED, "Failed to find interface %s", libtrace->uridata);
                         free(libtrace->format_data);
+                        libtrace->format_data = NULL;
                         return -1;
                 }
@@ -197 +199 @@
                                 (socklen_t)sizeof(addr))==-1) {
                 free(libtrace->format_data);
+                libtrace->format_data = NULL;
                 trace_set_err(libtrace, errno, "Failed to bind to interface %s", libtrace->uridata);
                 return -1;
@@ -305 +308 @@
 static int linuxnative_fin_input(libtrace_t *libtrace) 
 {
-        if (FORMAT(libtrace->format_data)->filter != NULL)
-                free(FORMAT(libtrace->format_data)->filter);
-        if (libtrace->format_data)
+        if (libtrace->format_data) {
+                if (FORMAT(libtrace->format_data)->filter != NULL)
+                        free(FORMAT(libtrace->format_data)->filter);
                 free(libtrace->format_data);
+        }
         
         return 0;