5d725462d
Bernhard Reutner-Fischer
2006-09-06
Subject
- strip 399424 off the bss by making decompress_uncompress buffers config buffers. Compile tested (too lazy to look for a small .Z on the net). $ size busybox.old busybox text data bss dec hex filename 859555 10232 645732 1515519 171fff busybox.old 859683 10232 246308 11
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
archival/libunarchive/decompress_uncompress.c+10 -12
| @@ -70,22 +70,12 @@ static int block_mode = BLOCK_MODE; | |
| /* user settable max # bits/code */ | |
| static int maxbits = BITS; | |
| - | /* Input buffer */ |
| - | static unsigned char inbuf[IBUFSIZ + 64]; |
| - | |
| - | /* Output buffer */ |
| - | static unsigned char outbuf[OBUFSIZ + 2048]; |
| - | |
| - | |
| - | static unsigned char htab[HSIZE]; |
| - | static unsigned short codetab[HSIZE]; |
| - | |
| #define htabof(i) htab[i] | |
| #define codetabof(i) codetab[i] | |
| #define tab_prefixof(i) codetabof(i) | |
| #define tab_suffixof(i) ((unsigned char *)(htab))[i] | |
| #define de_stack ((unsigned char *)&(htab[HSIZE-1])) | |
| - | #define clear_htab() memset(htab, -1, sizeof(htab)) |
| + | #define clear_htab() memset(htab, -1, HSIZE) |
| #define clear_tab_prefixof() memset(codetab, 0, 256); | |
| @@ -113,6 +103,12 @@ int uncompress(int fd_in, int fd_out) | |
| long int maxmaxcode; | |
| int n_bits; | |
| int rsize = 0; | |
| + | RESERVE_CONFIG_UBUFFER(inbuf, IBUFSIZ + 64); |
| + | RESERVE_CONFIG_UBUFFER(outbuf, OBUFSIZ + 2048); |
| + | unsigned char htab[HSIZE]; |
| + | unsigned short codetab[HSIZE]; |
| + | memset(inbuf, 0, IBUFSIZ + 64); |
| + | memset(outbuf, 0, OBUFSIZ + 2048); |
| insize = 0; | |
| @@ -160,7 +156,7 @@ int uncompress(int fd_in, int fd_out) | |
| posbits = 0; | |
| } | |
| - | if (insize < (int) sizeof(inbuf) - IBUFSIZ) { |
| + | if (insize < (int) (IBUFSIZ + 64) - IBUFSIZ) { |
| rsize = safe_read(fd_in, inbuf + insize, IBUFSIZ); | |
| insize += rsize; | |
| } | |
| @@ -286,5 +282,7 @@ int uncompress(int fd_in, int fd_out) | |
| write(fd_out, outbuf, outpos); | |
| } | |
| + | RELEASE_CONFIG_BUFFER(inbuf); |
| + | RELEASE_CONFIG_BUFFER(outbuf); |
| return 0; | |
| } | |