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 70c00879211b3461e674e1957f979278f7dd2253..e1d67a7f64c9a0ead2a619edb377a5c0b69b7031 100644 (file)
--- 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 );
 }