Skip to content

Commit 8bc172e

Browse files
rscharfegitster
authored andcommitted
apply: use starts_with() in gitdiff_verify_name()
Avoid running over the end of line -- a C string whose length is not known to this function -- by using starts_with() instead of memcmp(3) for checking if it starts with "/dev/null". Also simply include the newline in the string constant to compare against. Drop a comment that just states the obvious. Signed-off-by: Rene Scharfe <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 13b5af2 commit 8bc172e

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

apply.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -970,8 +970,7 @@ static int gitdiff_verify_name(struct apply_state *state,
970970
}
971971
free(another);
972972
} else {
973-
/* expect "/dev/null" */
974-
if (memcmp("/dev/null", line, 9) || line[9] != '\n')
973+
if (!starts_with(line, "/dev/null\n"))
975974
return error(_("git apply: bad git-diff - expected /dev/null on line %d"), state->linenr);
976975
}
977976

0 commit comments

Comments
 (0)