If realloc() fails, it'll leak the buffer.  Also increate buffer size
only if the allocation succeeded.

Signed-off-by: Namhyung Kim <namhy...@kernel.org>
---
 tools/lib/traceevent/trace-seq.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tools/lib/traceevent/trace-seq.c b/tools/lib/traceevent/trace-seq.c
index 7f24e8989401..941d35d2cf87 100644
--- a/tools/lib/traceevent/trace-seq.c
+++ b/tools/lib/traceevent/trace-seq.c
@@ -81,11 +81,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;
 }
 
 /**
-- 
1.7.11.7

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to