зеркало из https://github.com/microsoft/git.git
apply: use strcmp(3) for comparing strings in gitdiff_verify_name()
We don't know the length of the C string "another". It could be shorter than "name", which we compare it to using memchr(3). Call strcmp(3) instead to avoid running over the end of the former, and get rid of a strlen(3) call as a bonus. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
8bc172e5f2
Коммит
2d105451c0
3
apply.c
3
apply.c
|
@ -956,13 +956,12 @@ static int gitdiff_verify_name(struct apply_state *state,
|
|||
}
|
||||
|
||||
if (*name) {
|
||||
int len = strlen(*name);
|
||||
char *another;
|
||||
if (isnull)
|
||||
return error(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"),
|
||||
*name, state->linenr);
|
||||
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);
|
||||
return error((side == DIFF_NEW_NAME) ?
|
||||
_("git apply: bad git-diff - inconsistent new filename on line %d") :
|
||||
|
|
Загрузка…
Ссылка в новой задаче