ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-08-06 05:48:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix buffer over-read in sinfl.h

Browse Source
This commit is contained in:
Nikita Smith
2025-07-23 16:09:48 -07:00
committed by Ryan Fleury
parent 295a822889
commit 9fab69002c
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/third_party/sinfl/sinfl.h
Vendored
+18 -3
View File
@@ -126,6 +126,7 @@ extern "C" {
struct sinfl { struct sinfl {
const unsigned char *bitptr; const unsigned char *bitptr;
const unsigned char *bitend;
unsigned long long bitbuf; unsigned long long bitbuf;
int bitcnt; int bitcnt;
@@ -215,9 +216,22 @@ sinfl_copy128(unsigned char **dst, unsigned char **src) {
#endif #endif
static void static void
sinfl_refill(struct sinfl *s) { sinfl_refill(struct sinfl *s) {
s->bitbuf |= sinfl_read64(s->bitptr) << s->bitcnt; if (s->bitend - s->bitptr >= 8) {
s->bitptr += (63 - s->bitcnt) >> 3; // @raysan5: original code, only those 3 lines
s->bitcnt |= 56; /* bitcount in range [56,63] */ s->bitbuf |= sinfl_read64(s->bitptr) << s->bitcnt;
s->bitptr += (63 - s->bitcnt) >> 3;
s->bitcnt |= 56; /* bitcount in range [56,63] */
} else {
// @raysan5: added this case when bits remaining < 8
int bitswant = 63 - s->bitcnt;
int byteswant = bitswant >> 3;
int bytesuse = s->bitend - s->bitptr <= byteswant ? (int)(s->bitend - s->bitptr) : byteswant;
unsigned long long n = 0;
memcpy(&n, s->bitptr, bytesuse);
s->bitbuf |= n << s->bitcnt;
s->bitptr += bytesuse;
s->bitcnt += bytesuse << 3;
}
} }
static int static int
sinfl_peek(struct sinfl *s, int cnt) { sinfl_peek(struct sinfl *s, int cnt) {
@@ -389,6 +403,7 @@ sinfl_decompress(unsigned char *out, size_t cap, const unsigned char *in, size_t
int last = 0; int last = 0;
s.bitptr = in; s.bitptr = in;
s.bitend = e;
while (1) { while (1) {
switch (state) { switch (state) {
case hdr: { case hdr: {