darkkirb/old-exhal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix possible crash when compressing very small data

Browse source 
because i'm a fucking idiot and forgot that size_t is unsigned!
This commit is contained in:
devinacker 2015-04-17 18:30:21 -04:00
parent ab1823487b
commit 7dba51dd28
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
compress.c
View file

@ -4,7 +4,7 @@
This code is released under the terms of the MIT license. This code is released under the terms of the MIT license.
See COPYING.txt for details. See COPYING.txt for details.
Copyright (c) 2013 Devin Acker Copyright (c) 2013-2015 Devin Acker
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
@ -101,7 +101,7 @@ size_t pack(uint8_t *unpacked, size_t inputsize, uint8_t *packed, int fast) {
debug("inputsize = %d\n", inputsize); debug("inputsize = %d\n", inputsize);
for (uint16_t i = 0; i < inputsize - 4; i++) { for (uint16_t i = 0; inputsize >= 4 && i < inputsize - 4; i++) {
tuple_t *tuple; tuple_t *tuple;
int currbytes = COMBINE(unpacked[i], unpacked[i+1], unpacked[i+2], unpacked[i+3]); int currbytes = COMBINE(unpacked[i], unpacked[i+1], unpacked[i+2], unpacked[i+3]);
@ -119,7 +119,7 @@ size_t pack(uint8_t *unpacked, size_t inputsize, uint8_t *packed, int fast) {
// check for a potential RLE // check for a potential RLE
rle = rle_check(unpacked, unpacked + inpos, inputsize, fast); rle = rle_check(unpacked, unpacked + inpos, inputsize, fast);
// check for a potential back reference // check for a potential back reference
if (rle.size < LONG_RUN_SIZE && inpos < inputsize - 3) if (rle.size < LONG_RUN_SIZE && inputsize >= 3 && inpos < inputsize - 3)
backref = ref_search(unpacked, unpacked + inpos, inputsize, offsets, fast); backref = ref_search(unpacked, unpacked + inpos, inputsize, offsets, fast);
else backref.size = 0; else backref.size = 0;
@ -224,7 +224,7 @@ size_t unpack(uint8_t *packed, uint8_t *unpacked) {
// don't try to decompress > 64kb // don't try to decompress > 64kb
if (((command == 2) && (outpos + 2*length > DATA_SIZE)) if (((command == 2) && (outpos + 2*length > DATA_SIZE))
|| (outpos + length > DATA_SIZE)) { || (outpos + length > DATA_SIZE)) {
return 0; return 0;
} }