Skip to contentSkip to conversation

Fix memory leak on error

PATCH In review Thomas Jarosch 1 participant 2 messages Jan 25, 2013 – Jan 31, 2013 perf events

lore
Share & tools
lore

Thomas Jarosch

author
#0 lore raw

PATCH 1/3 Fix memory leak on error

cppcheck reported:
[util/event.c:480]: (error) Memory leak: event

Signed-off-by Thomas Jarosch <[email protected]>
---
 tools/perf/util/event.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
tools/perf/util/event.c +3 -1
index 3cf2c3e..5cd13d7 100644
@@ -476,8 +476,10 @@ int perf_event__synthesize_kernel_mmap(struct perf_tool *tool,
 		}
 	}
 
-	if (kallsyms__parse(filename, &args, find_symbol_cb) <= 0)
+	if (kallsyms__parse(filename, &args, find_symbol_cb) <= 0) {
+		free(event);
 		return -ENOENT;
+	}
 
 	map = machine->vmlinux_maps[MAP__FUNCTION];
 	size = snprintf(event->mmap.filename, sizeof(event->mmap.filename),
Signature · 1 line
1.7.11.7
author
#1 lore raw

[tip:perf/core] perf tools: Fix memory leak on error

Commit-ID:  0b9e01a4f0d1c8277da6824fe060ccb0434d2fde
Gitweb:     http://git.kernel.org/tip/0b9e01a4f0d1c8277da6824fe060ccb0434d2fde
Author:     Thomas Jarosch <[email protected]>
AuthorDate: Fri, 25 Jan 2013 11:20:47 +0100
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 30 Jan 2013 10:40:05 -0300

perf tools: Fix memory leak on error

cppcheck reported:
[util/event.c:480]: (error) Memory leak: event

Signed-off-by Thomas Jarosch <[email protected]>
Link http://lkml.kernel.org/r/2717013.8dV0naNhAV@storm open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 tools/perf/util/event.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
tools/perf/util/event.c +3 -1
index 3cf2c3e..5cd13d7 100644
@@ -476,8 +476,10 @@ int perf_event__synthesize_kernel_mmap(struct perf_tool *tool,
 		}
 	}
 
-	if (kallsyms__parse(filename, &args, find_symbol_cb) <= 0)
+	if (kallsyms__parse(filename, &args, find_symbol_cb) <= 0) {
+		free(event);
 		return -ENOENT;
+	}
 
 	map = machine->vmlinux_maps[MAP__FUNCTION];
 	size = snprintf(event->mmap.filename, sizeof(event->mmap.filename),