Commit 3026bba3 authored Jan 15, 2014 by Namhyung Kim Committed by Arnaldo Carvalho de Melo Jan 15, 2014

tools lib traceevent: Check return value of realloc()



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>

parent 3c6d8d84

tools/lib/traceevent/trace-seq.c

+9 −4

Original line number	Original line	Diff line number	Diff line
	@@ -91,11 +91,16 @@ void trace_seq_destroy(struct trace_seq *s)

	static void expand_buffer(struct trace_seq *s)		static void expand_buffer(struct trace_seq *s)
	{		{
	s->buffer_size += TRACE_SEQ_BUF_SIZE;		char *buf;
	s->buffer = realloc(s->buffer, s->buffer_size);
	if (WARN_ONCE(!s->buffer,		buf = realloc(s->buffer, s->buffer_size + TRACE_SEQ_BUF_SIZE);
	"Can't allocate trace_seq buffer memory"))		if (WARN_ONCE(!buf, "Can't allocate trace_seq buffer memory")) {
	s->state = TRACE_SEQ__MEM_ALLOC_FAILED;		s->state = TRACE_SEQ__MEM_ALLOC_FAILED;
			return;
			}

			s->buffer = buf;
			s->buffer_size += TRACE_SEQ_BUF_SIZE;
	}		}

	/**		/**