[PATCH] apply: use starts_with() in gitdiff_verify_name()
- From
René Scharfe <l.s.r@web.de>
- Date
- Jul 1, 2017, 09:10 UTC
- Message-ID
- <185fd8c0-e0bf-2522-77e3-3f9fce8a5d44@web.de>
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 <l.s.r@web.de> --- apply.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/apply.c b/apply.c index c442b89328..946be4d2f5 100644 --- a/apply.c +++ b/apply.c @@ -976,8 +976,7 @@ static int gitdiff_verify_name(struct apply_state *state, } free(another); } else { - /* expect "/dev/null" */ - if (memcmp("/dev/null", line, 9) || line[9] != '\n') + if (!starts_with(line, "/dev/null\n")) return error(_("git apply: bad git-diff - expected /dev/null on line %d"), state->linenr); }
-- 2.13.2