tools lib traceevent: Check return value of realloc()
authorNamhyung Kim <namhyung@kernel.org>
Wed, 15 Jan 2014 01:45:25 +0000 (10:45 +0900)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 15 Jan 2014 18:10:28 +0000 (15:10 -0300)
If realloc() fails, it'll leak the buffer.  Also increate buffer size
only if the allocation succeeded.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Reviewed-by: Jiri Olsa <jolsa@redhat.com>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1389750340-15965-3-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/lib/traceevent/trace-seq.c

index f7112138e6af99808ac5bb010bb4b6c82e34ea03..e454a2c66cac5934165e012f03125d30f8fb0230 100644 (file)
@@ -91,11 +91,16 @@ void trace_seq_destroy(struct trace_seq *s)
 
 static void expand_buffer(struct trace_seq *s)
 {
-       s->buffer_size += TRACE_SEQ_BUF_SIZE;
-       s->buffer = realloc(s->buffer, s->buffer_size);
-       if (WARN_ONCE(!s->buffer,
-                     "Can't allocate trace_seq buffer memory"))
+       char *buf;
+
+       buf = realloc(s->buffer, s->buffer_size + TRACE_SEQ_BUF_SIZE);
+       if (WARN_ONCE(!buf, "Can't allocate trace_seq buffer memory")) {
                s->state = TRACE_SEQ__MEM_ALLOC_FAILED;
+               return;
+       }
+
+       s->buffer = buf;
+       s->buffer_size += TRACE_SEQ_BUF_SIZE;
 }
 
 /**