lib/decompress_bunzip2.c: fix checkstack warning (dd21e9bd) · Commits · 戴 / test

Fix checkstack error: lib/decompress_bunzip2.c: In function `get_next_block': lib/decompress_bunzip2.c:511: warning: the frame size of 1932 bytes is larger than 1024 bytes byteCount, symToByte, and mtfSymbol cannot be declared static or allocated dynamically so place them in the bunzip_data struct. Signed-off-by:

Prarit Bhargava <prarit@redhat.com> Cc: Phillip Lougher <phillip@lougher.demon.co.uk> Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

lib/decompress_bunzip2.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -107,6 +107,8 @@ struct bunzip_data {
		unsigned char selectors[32768]; /* nSelectors = 15 bits */
		struct group_data groups[MAX_GROUPS]; /* Huffman coding tables */
		int io_error; /* non-zero if we have IO error */
		int byteCount[256];
		unsigned char symToByte[256], mtfSymbol[256];
		};


		@@ -158,14 +160,16 @@ static int INIT get_next_block(struct bunzip_data *bd)
		int *base = NULL;
		int *limit = NULL;
		int dbufCount, nextSym, dbufSize, groupCount, selector,
		i, j, k, t, runPos, symCount, symTotal, nSelectors,
		byteCount[256];
		unsigned char uc, symToByte[256], mtfSymbol[256], *selectors;
		i, j, k, t, runPos, symCount, symTotal, nSelectors, *byteCount;
		unsigned char uc, symToByte, mtfSymbol, *selectors;
		unsigned int *dbuf, origPtr;

		dbuf = bd->dbuf;
		dbufSize = bd->dbufSize;
		selectors = bd->selectors;
		byteCount = bd->byteCount;
		symToByte = bd->symToByte;
		mtfSymbol = bd->mtfSymbol;

		/* Read in header signature and CRC, then validate signature.
		(last block signature means CRC is for whole file, return now) */

Admin message