4 files changed, 50 insertions, 11 deletions

diff --git a/parse-events.c b/parse-events.c
index 82477a7..9f88472 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -207,8 +207,7 @@ static int add_new_comm(struct pevent *pevent, char *comm, int pid)
  * @pid: the pid to map the command line to
  *
  * This adds a mapping to search for command line names with
- * a given pid. Note, the comm that is given is stored and
- * a duplicate is not made.
+ * a given pid. The comm is duplicated.
  */
 int pevent_register_comm(struct pevent *pevent, char *comm, int pid)
 {
@@ -218,7 +217,7 @@ int pevent_register_comm(struct pevent *pevent, char *comm, int pid)
                 return add_new_comm(pevent, comm, pid);
 
         item = malloc_or_die(sizeof(*item));
-        item->comm = comm;
+        item->comm = strdup(comm);
         item->pid = pid;
         item->next = pevent->cmdlist;
 
@@ -356,7 +355,7 @@ const char *pevent_find_function(struct pevent *pevent, unsigned long long addr)
  * @mod: the kernel module the function may be in (NULL for none)
  *
  * This registers a function name with an address and module.
- * The @func passed in is stored and a copy is not made.
+ * The @func passed in is duplicated.
  */
 int pevent_register_function(struct pevent *pevent, char *func,
                              unsigned long long addr, char *mod)
@@ -366,8 +365,11 @@ int pevent_register_function(struct pevent *pevent, char *func,
         item = malloc_or_die(sizeof(*item));
 
         item->next = pevent->funclist;
-        item->func = func;
-        item->mod = mod;
+        item->func = strdup(func);
+        if (mod)
+                item->mod = strdup(mod);
+        else
+                item->mod = NULL;
         item->addr = addr;
 
         pevent->funclist = item;
@@ -476,7 +478,7 @@ find_printk(struct pevent *pevent, unsigned long long addr)
  * @addr: the address the string was located at
  *
  * This registers a string by the address it was stored in the kernel.
- * The @fmt is used in storage and a duplicate is not made.
+ * The @fmt passed in is duplicated.
  */
 int pevent_register_print_string(struct pevent *pevent, char *fmt,
                                  unsigned long long addr)
@@ -487,7 +489,7 @@ int pevent_register_print_string(struct pevent *pevent, char *fmt,
 
         item->next = pevent->printklist;
         pevent->printklist = item;
-        item->printk = fmt;
+        item->printk = strdup(fmt);
         item->addr = addr;
 
         pevent->printk_count++;
@@ -3799,9 +3801,23 @@ struct pevent *pevent_alloc(void)
         return pevent;
 }
 
+static void free_format_fields(struct format_field *field)
+{
+        struct format_field *next;
+
+        while (field) {
+                next = field->next;
+                free(field->type);
+                free(field->name);
+                free(field);
+                field = next;
+        }
+}
+
 static void free_formats(struct format *format)
 {
-        /* IMPLEMENT ME */
+        free_format_fields(format->common_fields);
+        free_format_fields(format->fields);
 }
 
 static void free_event(struct event_format *event)
@@ -3813,6 +3829,8 @@ static void free_event(struct event_format *event)
 
         free(event->print_fmt.format);
         free_args(event->print_fmt.args);
+
+        free(event);
 }
 
 /**
@@ -3876,4 +3894,6 @@ void pevent_free(struct pevent *pevent)
 
                 free_event(event);
         }
+
+        free(pevent);
 }
diff --git a/trace-input.c b/trace-input.c
index db48c91..72a604e 100644
--- a/trace-input.c
+++ b/trace-input.c
@@ -518,6 +518,13 @@ static void free_page(struct tracecmd_input *handle, int cpu)
         handle->cpu_data[cpu].page = NULL;
 }
 
+static void free_read_page(struct tracecmd_input *handle, int cpu)
+{
+        free_page(handle, cpu);
+        if (handle->read_page)
+                free(handle->cpu_data[cpu].read_page);
+}
+
 /*
  * Page is mapped, now read in the page header info.
  */
@@ -1485,8 +1492,17 @@ struct tracecmd_input *tracecmd_open(const char *file)
 
 void tracecmd_close(struct tracecmd_input *handle)
 {
-        /* TODO FREE EVERYTHING!!! %%%% MEMORY LEAK!!! %%%% */
+        int cpu;
+
+        if (!handle)
+                return;
+
+        for (cpu = 0; cpu < handle->cpus; cpu++)
+                free_read_page(handle, cpu);
+        free(handle->cpu_data);
+
         close(handle->fd);
+        pevent_free(handle->pevent);
         free(handle);
 }
 
diff --git a/trace-read.c b/trace-read.c
index 175d0d3..f2c7de2 100644
--- a/trace-read.c
+++ b/trace-read.c
@@ -412,7 +412,7 @@ void trace_report (int argc, char **argv)
 
         read_data_info(handle);
 
-        pevent_free(pevent);
+        tracecmd_close(handle);
 
         return;
 }
diff --git a/trace-util.c b/trace-util.c
index c3d89c6..d5be6ed 100644
--- a/trace-util.c
+++ b/trace-util.c
@@ -89,6 +89,7 @@ void parse_cmdlines(struct pevent *pevent,
                 sscanf(line, "%d %as", &pid,
                        (float *)(void *)&comm); /* workaround gcc warning */
                 pevent_register_comm(pevent, comm, pid);
+                free(comm);
                 line = strtok_r(NULL, "\n", &next);
         }
 }
@@ -121,6 +122,8 @@ void parse_proc_kallsyms(struct pevent *pevent,
                         mod[strlen(mod) - 1] = 0;
 
                 pevent_register_function(pevent, func, addr, mod);
+                free(func);
+                free(mod);
 
                 line = strtok_r(NULL, "\n", &next);
         }