apply: avoid possible bogus pointer
When parsing "index" lines from a git-diff, we look for a space followed by the mode. If we don't have a space, then we set our pointer to the end-of-line. However, we don't double-check that our end-of-line pointer is valid (e.g., if we got a truncated diff input), which could lead to some wrap-around pointer arithmetic. In most cases this would probably get caught by our "40 < len" check later in the function, but to be on the safe side, let's just use strchrnul to treat end-of-string the same as end-of-line. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jul 24, 2014 at 00:43 UTC
31bb6d37f992128eca3707d4f58ec61425742e81
1 file changed
+1
-1
builtin/apply.c
+1
-1
@@ -1073,7 +1073,7 @@ static int gitdiff_index(const char *line, struct patch *patch)
1073
1074
line = ptr + 2;
1075
ptr = strchr(line, ' ');
1076
- eol = strchr(line, '\n');
1076
+ eol = strchrnul(line, '\n');
1077
1078
if (!ptr || eol < ptr)
1079
ptr = eol;