Changeset b8826aa

Timestamp:

06/27/13 10:29:08 (7 years ago)

Author:

Perry Lorier <perry@…>

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:

d0cae69

Parents:

946f9e1

Message:

Fixes bug where the output file was destroyed multiple times on error if --merge-inputs was given.

Reported by:
The Mayhem Team (Alexandre Rebert, Thanassis Avgerinos, Sang Kil Cha,
David Brumley, Manuel Egele)
Cylab, Carnegie Mellon University

File:

• tools/tracertstats/tracertstats.c (modified) (3 diffs)

tools/tracertstats/tracertstats.c

@@ -80 +80 @@
 
 
-struct output_data_t *output;
+struct output_data_t *output = NULL;
 
 static void report_results(double ts,uint64_t count,uint64_t bytes)
@@ -138 +138 @@
                 trace_perror(trace,"trace_create");
                 trace_destroy(trace);
-                output_destroy(output);
+                if (!merge_inputs)
+                        output_destroy(output);
                 return; 
         }
@@ -144 +145 @@
                 trace_perror(trace,"trace_start");
                 trace_destroy(trace);
-                output_destroy(output);
+                if (!merge_inputs)
+                        output_destroy(output);
                 return;
         }