147ac93a0
Denys Vlasenko
2021-05-03
Subject
decompress_gunzip: simplify ERR_RET bit clearing
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
archival/libarchive/decompress_gunzip.c+2 -3
| @@ -230,9 +230,8 @@ static void huft_free(huft_t *p) | |
| * 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)); |
| - | } |
| + | //if (BAD_HUFT(p)) // commented out, since bit clearing has effect only if condition is true |
| + | p = (huft_t*)((uintptr_t)p & ~(uintptr_t)ERR_RET); |
| /* Go through linked list, freeing from the malloced (t[-1]) address. */ | |
| while (p) { | |