From: Florian Krohm <florian@eich-krohm.de>
Date: Tue, 2 Sep 2014 11:38:09 +0000 (+0000)
Subject: Avoid memory leak.
X-Git-Tag: svn/VALGRIND_3_10_0~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3aa58402fa06d1c646be729e61d1764e42e2e09d;p=thirdparty%2Fvalgrind.git

Avoid memory leak.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14429
---

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 );
 }