undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/apply-avoid-over-reading'

Browse Source 
Code cleanup.

* rs/apply-avoid-over-reading:
  apply: use strcmp(3) for comparing strings in gitdiff_verify_name()
This commit is contained in:
Junio C Hamano 2017-07-12 15:18:22 -07:00
commit 6fee4ca625
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apply.c
View File

@ -962,13 +962,12 @@ static int gitdiff_verify_name(struct apply_state *state,
} }
if (*name) { if (*name) {
int len = strlen(*name);
char *another; char *another;
if (isnull) if (isnull)
return error(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"), return error(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"),
*name, state->linenr); *name, state->linenr);
another = find_name(state, line, NULL, state->p_value, TERM_TAB); another = find_name(state, line, NULL, state->p_value, TERM_TAB);
if (!another || memcmp(another, *name, len + 1)) { if (!another || strcmp(another, *name)) {
free(another); free(another);
return error((side == DIFF_NEW_NAME) ? return error((side == DIFF_NEW_NAME) ?
_("git apply: bad git-diff - inconsistent new filename on line %d") : _("git apply: bad git-diff - inconsistent new filename on line %d") :