mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jm/maint-apply-detects-corrupt-patch-header'

Browse Source 
* jm/maint-apply-detects-corrupt-patch-header:
  fix "git apply --index ..." not to deref NULL
This commit is contained in:
Junio C Hamano
2011-10-19 10:48:29 -07:00
parent e283548b85 2c93286ab2
commit c31b87d111
2 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/apply.c
View File

@ -1407,6 +1407,9 @@ static int find_header(char *line, unsigned long size, int *hdrsize, struct patc
"%d leading pathname components (line %d)" , p_value, linenr);
patch->old_name = patch->new_name = patch->def_name;
}
if (!patch->is_delete && !patch->new_name)
die("git diff header lacks filename information "
"(line %d)", linenr);
patch->is_toplevel_relative = 1;
*hdrsize = git_hdr_len;
return offset;