diff options
| author | Tom Tromey <tromey@gcc.gnu.org> | 2004-10-11 18:45:43 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2004-10-11 18:45:43 +0000 |
| commit | 17210dff5d26c1e820e0cd678a46cf2795c41e4c (patch) | |
| tree | 01e6e6bb5683a568f3e4d7be40728b9b503640c4 /zlib/uncompr.c | |
| parent | 1325e2b519f4a1b3d9fbd92ece22bdf3e4df0b06 (diff) | |
| download | gcc-17210dff5d26c1e820e0cd678a46cf2795c41e4c.tar.gz | |
re PR libgcj/14856 (Update bundled zlib)
PR libgcj/14856:
* Imported zlib 1.2.1; merged local changes.
From-SVN: r88898
Diffstat (limited to 'zlib/uncompr.c')
| -rw-r--r-- | zlib/uncompr.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/zlib/uncompr.c b/zlib/uncompr.c index a8037709720..8519d9bfaf8 100644 --- a/zlib/uncompr.c +++ b/zlib/uncompr.c @@ -1,10 +1,11 @@ /* uncompr.c -- decompress a memory buffer - * Copyright (C) 1995-2002 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h + * Copyright (C) 1995-2003 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h */ /* @(#) $Id: uncompr.c,v 1.1.1.2 2002/03/11 21:53:27 tromey Exp $ */ +#define ZLIB_INTERNAL #include "zlib.h" /* =========================================================================== @@ -49,7 +50,9 @@ int ZEXPORT uncompress (dest, destLen, source, sourceLen) err = inflate(&stream, Z_FINISH); if (err != Z_STREAM_END) { inflateEnd(&stream); - return err == Z_OK ? Z_BUF_ERROR : err; + if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0)) + return Z_DATA_ERROR; + return err; } *destLen = stream.total_out; |