1 files changed, 73 insertions, 1 deletions

diff --git a/parse-events.c b/parse-events.c
index 53dc8ad..b6abd51 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -2180,6 +2180,7 @@ process_dynamic_array(struct event_format *event, struct print_arg *arg, char **
         if (read_expected(EVENT_DELIM, ")") < 0)
                 goto out_free;
 
+        free_token(token);
         type = read_token_item(&token);
         *tok = token;
         if (type != EVENT_OP || strcmp(token, "[") != 0)
@@ -2887,7 +2888,9 @@ eval_num_arg(void *data, int size, struct event_format *event, struct print_arg
         case PRINT_FUNC: {
                 struct trace_seq s;
                 trace_seq_init(&s);
-                return process_defined_func(&s, data, size, event, arg);
+                val = process_defined_func(&s, data, size, event, arg);
+                trace_seq_destroy(&s);
+                return val;
         }
         case PRINT_OP:
                 if (strcmp(arg->op.op, "[") == 0) {
@@ -3220,6 +3223,7 @@ process_defined_func(struct trace_seq *s, void *data, int size,
                         string->next = strings;
                         string->str = strdup(str.buffer);
                         strings = string;
+                        trace_seq_destroy(&str);
                         break;
                 default:
                         /*
@@ -3314,6 +3318,8 @@ static struct print_arg *make_bprint_args(char *fmt, void *data, int size, struc
                                                 ~3);
                                 switch (ls) {
                                 case 0:
+                                        ls = 4;
+                                        break;
                                 case 1:
                                         ls = pevent->long_size;
                                         break;
@@ -3879,6 +3885,11 @@ void pevent_print_event(struct pevent *pevent, struct trace_seq *s,
         usecs = record->ts - secs * NSECS_PER_SEC;
         usecs = (usecs + 500) / NSECS_PER_USEC;
 
+        if (record->size < 0) {
+                do_warning("ug! negative record size %d", record->size);
+                return;
+        }
+
         type = trace_parse_common_type(pevent, data);
 
         event = pevent_find_event(pevent, type);
@@ -4090,6 +4101,7 @@ static void print_args(struct print_arg *args)
                 trace_seq_init(&s);
                 print_fields(&s, args->flags.flags);
                 trace_seq_do_printf(&s);
+                trace_seq_destroy(&s);
                 printf(")");
                 break;
         case PRINT_SYMBOL:
@@ -4099,6 +4111,7 @@ static void print_args(struct print_arg *args)
                 trace_seq_init(&s);
                 print_fields(&s, args->symbol.symbols);
                 trace_seq_do_printf(&s);
+                trace_seq_destroy(&s);
                 printf(")");
                 break;
         case PRINT_STRING:
@@ -4441,6 +4454,56 @@ int get_field_val(struct trace_seq *s, struct format_field *field,
 }
 
 /**
+ * pevent_get_field_raw - return the raw pointer into the data field
+ * @s: The seq to print to on error
+ * @event: the event that the field is for
+ * @name: The name of the field
+ * @record: The record with the field name.
+ * @len: place to store the field length.
+ * @err: print default error if failed.
+ *
+ * Returns a pointer into record->data of the field and places
+ * the length of the field in @len.
+ *
+ * On failure, it returns NULL.
+ */
+void *pevent_get_field_raw(struct trace_seq *s, struct event_format *event,
+                           const char *name, struct record *record,
+                           int *len, int err)
+{
+        struct format_field *field;
+        void *data = record->data;
+        unsigned offset;
+        int dummy;
+
+        if (!event)
+                return NULL;
+
+        field = pevent_find_field(event, name);
+
+        if (!field) {
+                if (err)
+                        trace_seq_printf(s, "<CANT FIND FIELD %s>", name);
+                return NULL;
+        }
+
+        /* Allow @len to be NULL */
+        if (!len)
+                len = &dummy;
+
+        offset = field->offset;
+        if (field->flags & FIELD_IS_DYNAMIC) {
+                offset = pevent_read_number(event->pevent,
+                                            data + offset, field->size);
+                *len = offset >> 16;
+                offset &= 0xffff;
+        } else
+                *len = field->size;
+
+        return data + offset;
+}
+
+/**
  * pevent_get_field_val - find a field and return its value
  * @s: The seq to print to on error
  * @event: the event that the field is for
@@ -4457,6 +4520,9 @@ int pevent_get_field_val(struct trace_seq *s, struct event_format *event,
 {
         struct format_field *field;
 
+        if (!event)
+                return -1;
+
         field = pevent_find_field(event, name);
 
         return get_field_val(s, field, name, record, val, err);
@@ -4479,6 +4545,9 @@ int pevent_get_common_field_val(struct trace_seq *s, struct event_format *event,
 {
         struct format_field *field;
 
+        if (!event)
+                return -1;
+
         field = pevent_find_common_field(event, name);
 
         return get_field_val(s, field, name, record, val, err);
@@ -4501,6 +4570,9 @@ int pevent_get_any_field_val(struct trace_seq *s, struct event_format *event,
 {
         struct format_field *field;
 
+        if (!event)
+                return -1;
+
         field = pevent_find_any_field(event, name);
 
         return get_field_val(s, field, name, record, val, err);