Changeset e0d922a for lib

Timestamp:

01/11/19 16:24:49 (2 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop

Children:

2d16fc7

Parents:

ec19a99

Message:

Make sure ERF packet has a header before trying to access fields in it.

Mainly this will make sure things behave sanely if someone was to
ignore an error returned by trace_read_packet() and try to call
trace_get_capture_length() or some other format-specific function
on the packet anyway.

File:

• lib/format_erf.c (modified) (7 diffs)

lib/format_erf.c

@@ -789 +789 @@
         dag_record_t *erfptr = 0;
         erfptr = (dag_record_t *)packet->header;
-        uint8_t type = (erfptr->type & 0x7f);
+        uint8_t type;
+
+        if (packet->header == NULL) {
+                return ~0;
+        }
+
+        type = (erfptr->type & 0x7f);
         if (type != TYPE_LEGACY) {
                 /* The top-most bit is now used to indicate the presence of
@@ -806 +812 @@
         dag_record_t *erfptr = 0;
         erfptr = (dag_record_t *)packet->header;
-        return erfptr->flags.iface;
+        if (packet->header) {
+                return erfptr->flags.iface;
+        }
+        return TRACE_DIR_UNKNOWN;
 }
 
@@ -812 +821 @@
         dag_record_t *erfptr = 0;
         erfptr = (dag_record_t *)packet->header;
+
+        if (packet->header == NULL) {
+                return TRACE_DIR_UNKNOWN;
+        }
         erfptr->flags.iface = direction;
         return erfptr->flags.iface;
@@ -819 +832 @@
         dag_record_t *erfptr = 0;
         erfptr = (dag_record_t *)packet->header;
+
+        if (erfptr == NULL) {
+                return 0;
+        }
         return bswap_le_to_host64(erfptr->ts);
 }
@@ -828 +845 @@
         uint16_t wlen, rlen;
 
-        if (packet->payload == NULL)
+        if (packet->payload == NULL || packet->header == NULL)
                 return 0;
 
@@ -847 +864 @@
         erfptr = (dag_record_t *)packet->header;
 
+        if (packet->header == NULL) {
+                return 0;
+        }
+
         if ((erfptr->type & 0x7f) == TYPE_META)
                 return 0;
@@ -862 +883 @@
         }
         erfptr = (dag_record_t *)packet->header;
+
+        if (packet->header == NULL) {
+                return ~0U;
+        }
 
         if(size > trace_get_capture_length(packet) || (erfptr->type & 0x7f) == TYPE_META) {