1 files changed, 5 insertions, 3 deletions

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);