Changeset d0bc7e2 for lib

Timestamp:

01/07/19 18:16:12 (2 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop

Children:

2bce91d

Parents:

6514097 (diff), 630460b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch '87' of ​git://github.com/jacobvw/libtrace into jacobvw-87

Location:

lib

Files:

• format_linux_common.c (modified) (3 diffs)
• format_linux_ring.c (modified) (1 diff)

lib/format_linux_common.c

@@ -70 +70 @@
         pcap_t *pcap;
 
-        /* Take a copy of the filter object as it was passed in */
-        f = (libtrace_filter_t *) malloc(sizeof(libtrace_filter_t));
-        memcpy(f, filter, sizeof(libtrace_filter_t));
+        /* Take a copy of the filter structure to prevent against
+         * deletion causing the filter to no longer work */
+        f = (libtrace_filter_t *) malloc(sizeof(libtrace_filter_t));
+        memcpy(f, filter, sizeof(libtrace_filter_t));
+        f->filterstring = strdup(filter->filterstring);
 
         /* If we are passed a filter with "flag" set to zero, then we must
@@ -120 +122 @@
 
         if (FORMAT_DATA->filter != NULL)
-                free(FORMAT_DATA->filter);
+                trace_destroy_filter(FORMAT_DATA->filter);
 
         FORMAT_DATA->filter = f;
@@ -498 +500 @@
         if (libtrace->format_data) {
                 if (FORMAT_DATA->filter != NULL)
-                        free(FORMAT_DATA->filter);
+                        trace_destroy_filter(FORMAT_DATA->filter);
 
                 if (FORMAT_DATA->per_stream)

lib/format_linux_ring.c

@@ -308 +308 @@
                 }
 
-                if (FORMAT_DATA->filter != NULL)
-                        free(FORMAT_DATA->filter);
+                if (FORMAT_DATA->filter != NULL)
+                        trace_destroy_filter(FORMAT_DATA->filter);
 
                 if (FORMAT_DATA->per_stream)