|
From: <sv...@va...> - 2014-09-02 11:38:31
|
Author: florian
Date: Tue Sep 2 11:38:09 2014
New Revision: 14429
Log:
Avoid memory leak.
Modified:
trunk/cachegrind/cg_merge.c
Modified: trunk/cachegrind/cg_merge.c
==============================================================================
--- trunk/cachegrind/cg_merge.c (original)
+++ trunk/cachegrind/cg_merge.c Tue Sep 2 11:38:09 2014
@@ -261,10 +261,14 @@
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 );
}
|