Changeset c0c8843

Timestamp:

01/07/19 10:37:08 (23 months ago)

Author:

Jacob Van Walraven <jcv9@…>

Branches:

develop

Children:

b2e3894

Parents:

3dc6ed6

git-author:

Jacob Van Walraven <jcv9@…> (12/19/18 10:18:07)

git-committer:

Jacob Van Walraven <jcv9@…> (01/07/19 10:37:08)

Message:

Fix segfault when a meta packet was the final packet

File:

• tools/tracemerge/tracemerge.c (modified) (1 diff)

tools/tracemerge/tracemerge.c

@@ -243 +243 @@
                                 while (this_ts == 0 && IS_LIBTRACE_META_PACKET(packet[i])) {
                                         trace_write_packet(output,packet[i]);
-                                        /* read another packet */
+
+                                        /* read another packet, break if reached EOF */
                                         if (trace_read_packet(input[i],packet[i])>0) {
                                                 live[i] = true;
-                                        }
+                                        } else { break; }
+                                        //fprintf(stderr, "get timestamp\n");
                                         this_ts = trace_get_erf_timestamp(packet[i]);
+                                        //fprintf(stderr, "got timestamp\n");
                                 }