From 3aa58402fa06d1c646be729e61d1764e42e2e09d Mon Sep 17 00:00:00 2001 From: Florian Krohm Date: Tue, 2 Sep 2014 11:38:09 +0000 Subject: [PATCH] Avoid memory leak. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14429 --- cachegrind/cg_merge.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/cachegrind/cg_merge.c b/cachegrind/cg_merge.c index 70c0087921..e1d67a7f64 100644 --- a/cachegrind/cg_merge.c +++ b/cachegrind/cg_merge.c @@ -261,10 +261,14 @@ static void ddel_FileFn ( FileFn* ffn ) static FileFn* dopy_FileFn ( FileFn* ff ) { - char* fi2 = strdup(ff->fi_name); - char* fn2 = strdup(ff->fn_name); - if ((!fi2) || (!fn2)) + char *fi2, *fn2; + fi2 = strdup(ff->fi_name); + if (fi2 == NULL) return NULL; + fn2 = strdup(ff->fn_name); + if (fn2 == NULL) { + free(fi2); return NULL; + } return new_FileFn( fi2, fn2 ); } -- 2.47.2