From 212eb96a96e256933a76e48d85fa4f500bed0dee Mon Sep 17 00:00:00 2001 From: Thomas Rast Date: Fri, 21 Jun 2013 13:38:00 +0200 Subject: apply: carefully strdup a possibly-NULL name 2901bbe (apply: free patch->{def,old,new}_name fields, 2012-03-21) cleaned up the memory management of filenames in the patches, but forgot that find_name_traditional() can return NULL as a way of saying "I couldn't find a name". That NULL unfortunately gets passed into xstrdup() next, resulting in a segfault. Use null_strdup() so as to safely propagate the null, which will let us emit the correct error message. Reported-by: DevHC on #git Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano --- builtin/apply.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'builtin/apply.c') diff --git a/builtin/apply.c b/builtin/apply.c index b4428ea34f..f69a864abe 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -898,7 +898,7 @@ static void parse_traditional_patch(const char *first, const char *second, struc patch->old_name = name; } else { patch->old_name = name; - patch->new_name = xstrdup(name); + patch->new_name = null_strdup(name); } } if (!name) -- cgit v1.2.1