emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

decompress_gunzip: simplify ERR_RET bit clearing

Browse Source 
My gcc is in fact clever enough to do it itself, but let's be explicit

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2021-05-03 14:57:27 +02:00
parent 74e1f321c1
commit 147ac93a06
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
archival/libarchive/decompress_gunzip.c
View File

@ -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 * 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) * into a segmentation fault or an invalid pointer to free(p)
*/ */
if (BAD_HUFT(p)) { //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)); p = (huft_t*)((uintptr_t)p & ~(uintptr_t)ERR_RET);
}
/* Go through linked list, freeing from the malloced (t[-1]) address. */ /* Go through linked list, freeing from the malloced (t[-1]) address. */
while (p) { while (p) {