builtin/mv.c: plug miniscule memory leak

drafnel · gitster · commit 0d0ff65cea54 · 2011-10-06T13:54:32.000-07:00
The "it" string would not be free'ed if base_name was non-NULL.
Let's free it.

Signed-off-by: Brandon Casey &lt;drafnel@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/mv.c b/builtin/mv.c
@@ -29,7 +29,11 @@ static const char **copy_pathspec(const char *prefix, const char **pathspec,
 			to_copy--;
 		if (to_copy != length || base_name) {
 			char *it = xmemdupz(result[i], to_copy);
-			result[i] = base_name ? xstrdup(basename(it)) : it;
+			if (base_name) {
+				result[i] = xstrdup(basename(it));
+				free(it);
+			} else
+				result[i] = it;
 		}
 	}
 	return get_pathspec(prefix, result);

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,11 @@ static const char *copy_pathspec(const char prefix, const char **pathspec,`
`29`	`29`	`to_copy--;`
`30`	`30`	`if (to_copy != length \|\| base_name) {`
`31`	`31`	`char *it = xmemdupz(result[i], to_copy);`
`32`		`- result[i] = base_name ? xstrdup(basename(it)) : it;`
	`32`	`+ if (base_name) {`
	`33`	`+ result[i] = xstrdup(basename(it));`
	`34`	`+ free(it);`
	`35`	`+ } else`
	`36`	`+ result[i] = it;`
`33`	`37`	`}`
`34`	`38`	`}`
`35`	`39`	`return get_pathspec(prefix, result);`