CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-27 03:48:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add an output limit for zlib.decompress

Browse source
This commit is contained in:
dmiller 2026-07-01 02:06:11 +00:00
parent 6a9bf48387
commit 87e8e270d1
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
nse_zlib.cc
View file

@ -817,6 +817,7 @@ static int lzlib_decompress(lua_State *L)
size_t avail_in;
const char *next_in = luaL_checklstring(L, 1, &avail_in);
int windowBits = (int) luaL_optinteger(L, 2, 15);
int decompLimit = (int) luaL_optinteger(L, 3, 10*1024*1024);
int ret;
luaL_Buffer b;
@ -842,15 +843,20 @@ static int lzlib_decompress(lua_State *L)
zs.next_in = (unsigned char*)next_in;
zs.avail_in = avail_in;
for (;;) {
zs.next_out = (unsigned char*)luaL_prepbuffer(&b);
zs.avail_out = LUAL_BUFFERSIZE;
while(decompLimit > 0) {
unsigned int bufsize = LUAL_BUFFERSIZE;
if (bufsize > decompLimit)
bufsize = decompLimit;
zs.next_out = (unsigned char*)luaL_prepbuffsize(&b, bufsize);
zs.avail_out = bufsize;
/* bake some more */
ret = inflate(&zs, Z_FINISH);
/* push gathered data */
luaL_addsize(&b, LUAL_BUFFERSIZE - zs.avail_out);
unsigned int inflatesize = bufsize - zs.avail_out;
luaL_addsize(&b, inflatesize);
decompLimit -= inflatesize;
/* done processing? */
if (ret == Z_STREAM_END)

3
nselib/zlib.luadoc
View file

@ -52,7 +52,8 @@ function compress(buffer, level, method, windowBits, memLevel, strategy)
-- If windowBits is negative, this function decompresses raw deflate data without header.
-- @param buffer String containing DEFLATE-compressed data
-- @param windowBits Optional integer, the base-2 logarithm of the maximum window size. Default: 15
function decompress(buffer, windowBits)
-- @param decompLimit Optional integer, the maximum number of bytes to inflate. Default: 10MiB
function decompress(buffer, windowBits, decompLimit)
--- Return a deflate stream.
--