Rmys
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
diff -up busybox-1.33.0/archival/libarchive/decompress_gunzip.c.CVE-2021-28831 busybox-1.33.0/archival/libarchive/decompress_gunzip.c
|
|
--- busybox-1.33.0/archival/libarchive/decompress_gunzip.c.CVE-2021-28831 2021-03-22 13:55:11.883398937 -0400
|
|
+++ busybox-1.33.0/archival/libarchive/decompress_gunzip.c 2021-03-22 13:56:09.316681291 -0400
|
|
@@ -220,10 +220,20 @@ static const uint8_t border[] ALIGN1 = {
|
|
* each table.
|
|
* t: table to free
|
|
*/
|
|
+#define BAD_HUFT(p) ((uintptr_t)(p) & 1)
|
|
+#define ERR_RET ((huft_t*)(uintptr_t)1)
|
|
static void huft_free(huft_t *p)
|
|
{
|
|
huft_t *q;
|
|
|
|
+ /*
|
|
+ * If 'p' has the error bit set we have to clear it, otherwise we might run
|
|
+ * into a segmentation fault or an invalid pointer to free(p)
|
|
+ */
|
|
+ if (BAD_HUFT(p)) {
|
|
+ p = (huft_t*)((uintptr_t)(p) ^ (uintptr_t)(ERR_RET));
|
|
+ }
|
|
+
|
|
/* Go through linked list, freeing from the malloced (t[-1]) address. */
|
|
while (p) {
|
|
q = (--p)->v.t;
|
|
@@ -289,8 +299,6 @@ static unsigned fill_bitbuffer(STATE_PAR
|
|
* or a valid pointer to a Huffman table, ORed with 0x1 if incompete table
|
|
* is given: "fixed inflate" decoder feeds us such data.
|
|
*/
|
|
-#define BAD_HUFT(p) ((uintptr_t)(p) & 1)
|
|
-#define ERR_RET ((huft_t*)(uintptr_t)1)
|
|
static huft_t* huft_build(const unsigned *b, const unsigned n,
|
|
const unsigned s, const struct cp_ext *cp_ext,
|
|
unsigned *m)
|