From d6657a285dce9e65c829436dce7804f3e0d2642f Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Fri, 20 Jul 2018 14:04:58 +0200 Subject: [PATCH] zchunk: fix bounds check in getuint --- ext/solv_zchunk.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ext/solv_zchunk.c b/ext/solv_zchunk.c index 3843c9be..a8b7f8e2 100644 --- a/ext/solv_zchunk.c +++ b/ext/solv_zchunk.c @@ -58,27 +58,27 @@ getuint(unsigned char *p, unsigned char *endp, unsigned int *dp) { if (!p || p >= endp) return 0; - if (p <= endp && (*p & 0x80) != 0) + if (p < endp && (*p & 0x80) != 0) { *dp = p[0] ^ 0x80; return p + 1; } - if (++p <= endp && (*p & 0x80) != 0) + if (++p < endp && (*p & 0x80) != 0) { *dp = p[-1] ^ ((p[0] ^ 0x80) << 7); return p + 1; } - if (++p <= endp && (*p & 0x80) != 0) + if (++p < endp && (*p & 0x80) != 0) { *dp = p[-2] ^ (p[-1] << 7) ^ ((p[0] ^ 0x80) << 14); return p + 1; } - if (++p <= endp && (*p & 0x80) != 0) + if (++p < endp && (*p & 0x80) != 0) { *dp = p[-3] ^ (p[-2] << 7) ^ (p[1] << 14) ^ ((p[0] ^ 0x80) << 21); return p + 1; } - if (++p <= endp && (*p & 0xf0) == 0x80) + if (++p < endp && (*p & 0xf0) == 0x80) { *dp = p[-4] ^ (p[-3] << 7) ^ (p[2] << 14) ^ (p[1] << 21) ^ ((p[0] ^ 0x80) << 28); return p + 1; -- 2.47.2