3 files changed, 39 insertions, 32 deletions

diff --git a/parse-events.c b/parse-events.c
index 9bbb401..01588c5 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -47,6 +47,18 @@ void breakpoint(void)
         x++;
 }
 
+struct print_arg *alloc_arg(void)
+{
+        struct print_arg *arg;
+
+        arg = malloc_or_die(sizeof(*arg));
+        if (!arg)
+                return NULL;
+        memset(arg, 0, sizeof(*arg));
+
+        return arg;
+}
+
 struct cmdline {
         char *comm;
         int pid;
@@ -1245,12 +1257,9 @@ process_cond(struct event_format *event, struct print_arg *top, char **tok)
         enum event_type type;
         char *token = NULL;
 
-        arg = malloc_or_die(sizeof(*arg));
-        memset(arg, 0, sizeof(*arg));
-
-        left = malloc_or_die(sizeof(*left));
-
-        right = malloc_or_die(sizeof(*right));
+        arg = alloc_arg();
+        left = alloc_arg();
+        right = alloc_arg();
 
         arg->type = PRINT_OP;
         arg->op.left = left;
@@ -1285,8 +1294,7 @@ process_array(struct event_format *event, struct print_arg *top, char **tok)
         enum event_type type;
         char *token = NULL;
 
-        arg = malloc_or_die(sizeof(*arg));
-        memset(arg, 0, sizeof(*arg));
+        arg = alloc_arg();
 
         *tok = NULL;
         type = process_arg(event, arg, &token);
@@ -1398,18 +1406,18 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
                 }
 
                 /* make an empty left */
-                left = malloc_or_die(sizeof(*left));
+                left = alloc_arg();
                 left->type = PRINT_NULL;
                 arg->op.left = left;
 
-                right = malloc_or_die(sizeof(*right));
+                right = alloc_arg();
                 arg->op.right = right;
 
                 type = process_arg(event, right, tok);
 
         } else if (strcmp(token, "?") == 0) {
 
-                left = malloc_or_die(sizeof(*left));
+                left = alloc_arg();
                 /* copy the top arg to the left */
                 *left = *arg;
 
@@ -1436,7 +1444,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
                    strcmp(token, "==") == 0 ||
                    strcmp(token, "!=") == 0) {
 
-                left = malloc_or_die(sizeof(*left));
+                left = alloc_arg();
 
                 /* copy the top arg to the left */
                 *left = *arg;
@@ -1447,7 +1455,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
 
                 set_op_prio(arg);
 
-                right = malloc_or_die(sizeof(*right));
+                right = alloc_arg();
 
                 type = read_token_item(&token);
                 *tok = token;
@@ -1458,7 +1466,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
                         if (left->type != PRINT_ATOM)
                                 die("bad pointer type");
                         left->atom.atom = realloc(left->atom.atom,
-                                            sizeof(left->atom.atom) + 3);
+                                            strlen(left->atom.atom) + 3);
                         strcat(left->atom.atom, " *");
                         *arg = *left;
                         free(left);
@@ -1472,7 +1480,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
 
         } else if (strcmp(token, "[") == 0) {
 
-                left = malloc_or_die(sizeof(*left));
+                left = alloc_arg();
                 *left = *arg;
 
                 arg->type = PRINT_OP;
@@ -1784,7 +1792,7 @@ process_fields(struct event_format *event, struct print_flag_sym **list, char **
                 if (test_type_token(type, token, EVENT_OP, "{"))
                         break;
 
-                arg = malloc_or_die(sizeof(*arg));
+                arg = alloc_arg();
 
                 free_token(token);
                 type = process_arg(event, arg, &token);
@@ -1837,7 +1845,7 @@ process_flags(struct event_format *event, struct print_arg *arg, char **tok)
         if (read_expected_item(EVENT_DELIM, "(") < 0)
                 return EVENT_ERROR;
 
-        field = malloc_or_die(sizeof(*field));
+        field = alloc_arg();
 
         type = process_arg(event, field, &token);
         if (test_type_token(type, token, EVENT_DELIM, ","))
@@ -1880,7 +1888,7 @@ process_symbols(struct event_format *event, struct print_arg *arg, char **tok)
         if (read_expected_item(EVENT_DELIM, "(") < 0)
                 return EVENT_ERROR;
 
-        field = malloc_or_die(sizeof(*field));
+        field = alloc_arg();
 
         type = process_arg(event, field, &token);
         if (test_type_token(type, token, EVENT_DELIM, ","))
@@ -1941,7 +1949,7 @@ process_dynamic_array(struct event_format *event, struct print_arg *arg, char **
                 return type;
 
         free_token(token);
-        arg = malloc_or_die(sizeof(*arg));
+        arg = alloc_arg();
         type = process_arg(event, arg, &token);
         if (type == EVENT_ERROR)
                 goto out_free;
@@ -1997,8 +2005,7 @@ process_paren(struct event_format *event, struct print_arg *arg, char **tok)
                 if (arg->type != PRINT_ATOM)
                         die("previous needed to be PRINT_ATOM");
 
-                item_arg = malloc_or_die(sizeof(*item_arg));
-                memset(item_arg, 0, sizeof(*item_arg));
+                item_arg = alloc_arg();
 
                 arg->type = PRINT_TYPE;
                 arg->typecast.type = arg->atom.atom;
@@ -2132,8 +2139,7 @@ static int event_read_print_args(struct event_format *event, struct print_arg **
                         continue;
                 }
 
-                arg = malloc_or_die(sizeof(*arg));
-                memset(arg, 0, sizeof(*arg));
+                arg = alloc_arg();
 
                 type = process_arg(event, arg, &token);
 
@@ -2790,7 +2796,7 @@ static struct print_arg *make_bprint_args(char *fmt, void *data, int size, struc
         /*
          * The first arg is the IP pointer.
          */
-        args = malloc_or_die(sizeof(*args));
+        args = alloc_arg();
         arg = args;
         arg->next = NULL;
         next = &arg->next;
@@ -2840,7 +2846,7 @@ static struct print_arg *make_bprint_args(char *fmt, void *data, int size, struc
                                 }
                                 val = pevent_read_number(pevent, bptr, ls);
                                 bptr += ls;
-                                arg = malloc_or_die(sizeof(*arg));
+                                arg = alloc_arg();
                                 arg->next = NULL;
                                 arg->type = PRINT_ATOM;
                                 arg->atom.atom = malloc_or_die(32);
@@ -2849,7 +2855,7 @@ static struct print_arg *make_bprint_args(char *fmt, void *data, int size, struc
                                 next = &arg->next;
                                 break;
                         case 's':
-                                arg = malloc_or_die(sizeof(*arg));
+                                arg = alloc_arg();
                                 arg->next = NULL;
                                 arg->type = PRINT_STRING;
                                 arg->string.string = strdup(bptr);
@@ -3646,8 +3652,7 @@ int pevent_parse_event(struct pevent *pevent,
 
                 list = &event->print_fmt.args;
                 for (field = event->format.fields; field; field = field->next) {
-                        arg = malloc_or_die(sizeof(*arg));
-                        memset(arg, 0, sizeof(*arg));
+                        arg = alloc_arg();
                         *list = arg;
                         list = &arg->next;
                         arg->type = PRINT_FIELD;
diff --git a/trace-input.c b/trace-input.c
index c55e94f..db48c91 100644
--- a/trace-input.c
+++ b/trace-input.c
@@ -139,7 +139,7 @@ static char *read_string(struct tracecmd_input *handle)
                 str[size] = 0;
         } else {
                 size = i + 1;
-                str = malloc(i);
+                str = malloc(size);
                 if (!str)
                         return NULL;
                 memcpy(str, buf, i);
@@ -369,13 +369,14 @@ static int read_proc_kallsyms(struct tracecmd_input *handle)
         if (size < 0)
                 return -1;
 
-        buf = malloc(size);
+        buf = malloc(size+1);
         if (!buf)
                 return -1;
         if (do_read_check(handle, buf, size)){
                 free(buf);
                 return -1;
         }
+        buf[size] = 0;
 
         parse_proc_kallsyms(pevent, buf, size);
 
@@ -1334,13 +1335,14 @@ int tracecmd_init_data(struct tracecmd_input *handle)
         size = read8(handle);
         if (size < 0)
                 return -1;
-        cmdlines = malloc(size);
+        cmdlines = malloc(size + 1);
         if (!cmdlines)
                 return -1;
         if (do_read_check(handle, cmdlines, size)) {
                 free(cmdlines);
                 return -1;
         }
+        cmdlines[size] = 0;
         parse_cmdlines(pevent, cmdlines, size);
         free(cmdlines);
 
diff --git a/trace-read.c b/trace-read.c
index a7cac1e..b17c271 100644
--- a/trace-read.c
+++ b/trace-read.c
@@ -287,7 +287,7 @@ void trace_report (int argc, char **argv)
         int show_endian = 0;
         int show_page_size = 0;
         int show_printk = 0;
-        int latency_format;
+        int latency_format = 0;
         int show_events = 0;
         int print_events = 0;
         int c;