| Index: third_party/zlib/infback.c
|
| diff --git a/third_party/zlib/infback.c b/third_party/zlib/infback.c
|
| index af3a8c965d50cc6ac05c6c844a8f79e2cdc9f3c1..f3833c2e434a560b41325d0001c9c4ff0d5d1279 100644
|
| --- a/third_party/zlib/infback.c
|
| +++ b/third_party/zlib/infback.c
|
| @@ -1,5 +1,5 @@
|
| /* infback.c -- inflate using a call-back interface
|
| - * Copyright (C) 1995-2009 Mark Adler
|
| + * Copyright (C) 1995-2011 Mark Adler
|
| * For conditions of distribution and use, see copyright notice in zlib.h
|
| */
|
|
|
| @@ -42,10 +42,19 @@ int stream_size;
|
| return Z_STREAM_ERROR;
|
| strm->msg = Z_NULL; /* in case we return an error */
|
| if (strm->zalloc == (alloc_func)0) {
|
| +#ifdef Z_SOLO
|
| + return Z_STREAM_ERROR;
|
| +#else
|
| strm->zalloc = zcalloc;
|
| strm->opaque = (voidpf)0;
|
| +#endif
|
| }
|
| - if (strm->zfree == (free_func)0) strm->zfree = zcfree;
|
| + if (strm->zfree == (free_func)0)
|
| +#ifdef Z_SOLO
|
| + return Z_STREAM_ERROR;
|
| +#else
|
| + strm->zfree = zcfree;
|
| +#endif
|
| state = (struct inflate_state FAR *)ZALLOC(strm, 1,
|
| sizeof(struct inflate_state));
|
| if (state == Z_NULL) return Z_MEM_ERROR;
|
| @@ -246,7 +255,7 @@ out_func out;
|
| void FAR *out_desc;
|
| {
|
| struct inflate_state FAR *state;
|
| - unsigned char FAR *next; /* next input */
|
| + z_const unsigned char FAR *next; /* next input */
|
| unsigned char FAR *put; /* next output */
|
| unsigned have, left; /* available input and output */
|
| unsigned long hold; /* bit buffer */
|
| @@ -394,7 +403,6 @@ void FAR *out_desc;
|
| PULLBYTE();
|
| }
|
| if (here.val < 16) {
|
| - NEEDBITS(here.bits);
|
| DROPBITS(here.bits);
|
| state->lens[state->have++] = here.val;
|
| }
|
|
|