From: René Scharfe <l.s.r@web.de>
Date: Sat, 1 Jul 2017 09:10:07 +0000 (+0200)
Subject: apply: use starts_with() in gitdiff_verify_name()
X-Git-Tag: v2.14.0-rc0~29^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8bc172e5f29894d440aab772ae3a49eb2eaf5585

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 <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/apply.c b/apply.c
index 5e3780d281..4024e70c54 100644
--- a/apply.c
+++ b/apply.c
@@ -970,8 +970,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);
 	}