From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 31 Jul 2017 20:51:04 +0000 (-0700)
Subject: Merge branch 'rs/apply-avoid-over-reading' into maint
X-Git-Tag: v2.13.4~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bc2c50fc2c6ed72140ade798fc4d5c9ddf2d50c4?hp=2187e112d719109cac64d39e1bd8a04b123b6eed

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

Code cleanup.

* rs/apply-avoid-over-reading:
apply: use strcmp(3) for comparing strings in gitdiff_verify_name()
apply: use starts_with() in gitdiff_verify_name()
---

diff --git a/apply.c b/apply.c
index 7a9f4c8e0b..f8bf0bd932 100644
--- a/apply.c
+++ b/apply.c
@@ -972,13 +972,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") :
@@ -986,8 +985,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);
 	}