Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 32917
b: refs/heads/master
c: 31925c8
h: refs/heads/master
i:
  32915: 7fed566
v: v3
  • Loading branch information
Peter Korsgaard authored and Linus Torvalds committed Jul 31, 2006
1 parent 05b8fdb commit fb6828e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 163ecdff060f2fa9e8f5238882fd0137493556a6
refs/heads/master: 31925c8857ba17c11129b766a980ff7c87780301
5 changes: 4 additions & 1 deletion trunk/lib/zlib_inflate/inflate.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit fb6828e

Please sign in to comment.