Changeset 5fe998b

Timestamp:

01/08/19 10:09:47 (22 months ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop

Children:

4ac48fa

Parents:

2bce91d

Message:

Make sure we zero any filter structures we allocate

This fixes "uninitialised bytes" warnings that we get from
valgrind whenever filters are used with ring:

Location:

lib

Files:

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

lib/format_linux_common.c

@@ -73 +73 @@
          * deletion causing the filter to no longer work */
         f = (libtrace_filter_t *) malloc(sizeof(libtrace_filter_t));
+        memset(f, 0, sizeof(libtrace_filter_t));
         memcpy(f, filter, sizeof(libtrace_filter_t));
         f->filterstring = strdup(filter->filterstring);

lib/trace.c

@@ -1554 +1554 @@
 #else
         struct libtrace_filter_t *filter = (struct libtrace_filter_t *)
-                malloc(sizeof(struct libtrace_filter_t));
+                calloc(1, sizeof(struct libtrace_filter_t));
         filter->filter.bf_insns = (struct bpf_insn *)
                 malloc(sizeof(struct bpf_insn) * bf_len);
@@ -1578 +1578 @@
 #ifdef HAVE_BPF
         libtrace_filter_t *filter = (libtrace_filter_t*)
-                                malloc(sizeof(libtrace_filter_t));
+                                calloc(1, sizeof(libtrace_filter_t));
         filter->filterstring = strdup(filterstring);
         filter->jitfilter = NULL;