Changeset e375e0f

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.

Location:

lib

Files:

• libtrace_int.h (modified) (2 diffs)
• trace.c (modified) (2 diffs)
• trace_parallel.c (modified) (1 diff)

lib/libtrace_int.h

@@ -182 +182 @@
         THREAD_PAUSED,
         THREAD_STATE_MAX
+};
+
+enum hash_owner {
+        HASH_OWNED_LIBTRACE,
+        HASH_OWNED_EXTERNAL,
 };
 
@@ -347 +352 @@
         fn_hasher hasher;
         void *hasher_data;
+        enum hash_owner hasher_owner;
         /** The pread_packet choosen path for the configuration */
         int (*pread)(libtrace_t *, libtrace_thread_t *, libtrace_packet_t **, size_t);

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);

lib/trace_parallel.c

@@ -2160 +2160 @@
         trace->hasher_type = type;
         if (hasher) {
+                if (trace->hasher_owner == HASH_OWNED_LIBTRACE) {
+                        if (trace->hasher_data) {
+                                free(trace->hasher_data);
+                        }
+                }
                 trace->hasher = hasher;
                 trace->hasher_data = data;
+                trace->hasher_owner = HASH_OWNED_EXTERNAL;
         } else {
                 trace->hasher = NULL;
                 trace->hasher_data = NULL;
+                trace->hasher_owner = HASH_OWNED_LIBTRACE;
         }