Changeset e375e0f for lib/trace.c

Timestamp:

02/28/18 15:11:24 (3 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

cachetimestamps, develop, etsilive, master, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance

Children:

e4eaca5

Parents:

5c07bfe

Message:

Fix bug where libtrace-created hasher_data was leaked.

If trace_set_hasher was called with a null hasher, libtrace
would malloc memory for storing hasher_data. However, that
memory was never freed, since we had no way of telling whether
that memory had been externally allocated and passed in to
trace_set_hasher or if the memory had been allocated by libtrace.

Added a flag to the libtrace_t structure that records who owns
hasher_data and will now free it during trace_destroy if the
memory was allocated by libtrace.

File:

• lib/trace.c (modified) (2 diffs)

lib/trace.c

@@ -271 +271 @@
         libtrace->hasher = NULL;
         libtrace->hasher_data = NULL;
+        libtrace->hasher_owner = HASH_OWNED_EXTERNAL;
         libtrace_zero_ocache(&libtrace->packet_freelist);
         libtrace_zero_thread(&libtrace->hasher_thread);
@@ -738 +739 @@
         }
 
+        if (libtrace->hasher_owner == HASH_OWNED_LIBTRACE) {
+                if (libtrace->hasher_data) {
+                        free(libtrace->hasher_data);
+                }
+        }
+
+
         if (libtrace->perpkt_cbs)
                 trace_destroy_callback_set(libtrace->perpkt_cbs);