From: Matthew DeVore <matvore@google.com>
Date: Tue, 4 Jun 2019 17:57:04 +0000 (-0700)
Subject: url: do not read past end of buffer
X-Git-Tag: v2.23.0-rc0~98^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3f6b8a6177f3197ddad82a6da2ff9b4704664f5d

url: do not read past end of buffer

url_decode_internal could have been tricked into reading past the length
of the **query buffer if there are fewer than 2 characters after a % (in
a null-terminated string, % would have to be the last character).
Prevent this from happening by checking len before decoding the %
sequence.

Helped-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Matthew DeVore <matvore@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/url.c b/url.c
index 25576c390b..9ea9d5611b 100644
--- a/url.c
+++ b/url.c
@@ -46,7 +46,7 @@ static char *url_decode_internal(const char **query, int len,
 			break;
 		}
 
-		if (c == '%') {
+		if (c == '%' && (len < 0 || len >= 3)) {
 			int val = hex2chr(q + 1);
 			if (0 <= val) {
 				strbuf_addch(out, val);