diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:35:48 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:35:48 -0400 |
commit | 36a2c6b28003dd0592b8ece5e9409991e0820f50 (patch) | |
tree | c5b52547b2658a8a3b898b8224b835a7e8396017 /lib | |
parent | 95916edd02e3a7752315422f386c55723d4a3637 (diff) | |
parent | f1d39b291e2263f5e2f2ec5d4061802f76d8ae67 (diff) |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'lib')
-rw-r--r-- | lib/zlib_inflate/inflate.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/zlib_inflate/inflate.c b/lib/zlib_inflate/inflate.c index 7f922dccf1a..fceb97c3aff 100644 --- a/lib/zlib_inflate/inflate.c +++ b/lib/zlib_inflate/inflate.c @@ -347,7 +347,10 @@ int zlib_inflate(z_streamp strm, int flush) static const unsigned short order[19] = /* permutation of code lengths */ {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; - if (strm == NULL || strm->state == NULL || strm->next_out == NULL || + /* Do not check for strm->next_out == NULL here as ppc zImage + inflates to strm->next_out = 0 */ + + if (strm == NULL || strm->state == NULL || (strm->next_in == NULL && strm->avail_in != 0)) return Z_STREAM_ERROR; |