Changeset bccdffc

Timestamp:

11/08/18 14:00:04 (2 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop, master

Children:

0bb8d49

Parents:

ffe93e5

Message:

Fix issue where reading ERF packets would cause segfaults.

Stupid bug introduced alongside the recent framing length caching.

Location:

lib

Files:

• format_erf.c (modified) (1 diff)
• trace.c (modified) (2 diffs)

lib/format_erf.c

@@ -469 +469 @@
                 packet->payload = NULL;
         } else {
-                packet->payload = (char*)packet->buffer + trace_get_framing_length(packet);
+                packet->payload = ((char*)packet->buffer) + trace_get_framing_length(packet);
         }
 

lib/trace.c

@@ -986 +986 @@
                          * structure */
                         packet->trace = libtrace;
+                        packet->which_trace_start = libtrace->startcount;
                         ret=libtrace->format->read_packet(libtrace,packet);
                         if (ret==(size_t)READ_MESSAGE ||
@@ -1019 +1020 @@
                                 trace_packet_set_order(packet, libtrace->sequence_number);
                         }
-                        packet->which_trace_start = libtrace->startcount;
                         ++libtrace->sequence_number;
                         if (!libtrace_parallel && packet->trace == libtrace)