diff options
Diffstat (limited to 'dep/src/zlib/uncompr.c')
| -rw-r--r-- | dep/src/zlib/uncompr.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/dep/src/zlib/uncompr.c b/dep/src/zlib/uncompr.c index 5858b9f2279..b59e3d0defb 100644 --- a/dep/src/zlib/uncompr.c +++ b/dep/src/zlib/uncompr.c @@ -2,9 +2,12 @@ * Copyright (C) 1995-2003 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ + /* @(#) $Id$ */ + #define ZLIB_INTERNAL #include "zlib.h" + /* =========================================================================== Decompresses the source buffer into the destination buffer. sourceLen is the byte length of the source buffer. Upon entry, destLen is the total @@ -15,6 +18,7 @@ Upon exit, destLen is the actual size of the compressed buffer. This function can be used to decompress a whole file at once if the input file is mmap'ed. + uncompress returns Z_OK if success, Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR if there was not enough room in the output buffer, or Z_DATA_ERROR if the input data was corrupted. @@ -27,17 +31,22 @@ int ZEXPORT uncompress (dest, destLen, source, sourceLen) { z_stream stream; int err; + stream.next_in = (Bytef*)source; stream.avail_in = (uInt)sourceLen; /* Check for source > 64K on 16-bit machine: */ if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; + stream.next_out = dest; stream.avail_out = (uInt)*destLen; if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; + stream.zalloc = (alloc_func)0; stream.zfree = (free_func)0; + err = inflateInit(&stream); if (err != Z_OK) return err; + err = inflate(&stream, Z_FINISH); if (err != Z_STREAM_END) { inflateEnd(&stream); @@ -46,6 +55,7 @@ int ZEXPORT uncompress (dest, destLen, source, sourceLen) return err; } *destLen = stream.total_out; + err = inflateEnd(&stream); return err; } |