kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

apply: remove unused call to free() in gitdiff_{old,new}name() 

These two functions keep a copy of filename it was given, let
gitdiff_verify_name() to rewrite it to a new filename and then free
the original if they receive a newly minted filename.

However

 (1) when the original name is NULL, gitdiff_verify_name() returns
     either NULL or a newly minted value.  Either case, we do not
     have to worry about calling free() on the original NULL.

 (2) when the original name is not NULL, gitdiff_verify_name()
     either returns that as-is, or calls die() when it finds
     inconsistency in the patch.  When the function returns, we know
     that "if ()" statement always is false.

Noticed by Christian Couder.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 2016-03-22 14:41:08 -07:00
parent fda3e2cf01
commit db354b7f1b
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/apply.c
View File

@ -953,21 +953,15 @@ static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name,


static int gitdiff_oldname(const char *line, struct patch *patch) static int gitdiff_oldname(const char *line, struct patch *patch)
{ {
char *orig = patch->old_name;
patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name,
DIFF_OLD_NAME); DIFF_OLD_NAME);
if (orig != patch->old_name)
free(orig);
return 0; return 0;
} }


static int gitdiff_newname(const char *line, struct patch *patch) static int gitdiff_newname(const char *line, struct patch *patch)
{ {
char *orig = patch->new_name;
patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name,
DIFF_NEW_NAME); DIFF_NEW_NAME);
if (orig != patch->new_name)
free(orig);
return 0; return 0;
} }