summaryrefslogtreecommitdiffstats
path: root/zlib-1.2.5/infback.c
diff options
context:
space:
mode:
authorcedeel@gmail.com <cedeel@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-06-04 01:35:17 +0200
committercedeel@gmail.com <cedeel@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-06-04 01:35:17 +0200
commitb17d12c86f3e7414673d653396d2dce2e862b1e3 (patch)
tree95225ff23d64c0ea4a621401b841efe55b5a6169 /zlib-1.2.5/infback.c
parentAdded planks into items.ini (diff)
downloadcuberite-b17d12c86f3e7414673d653396d2dce2e862b1e3.tar
cuberite-b17d12c86f3e7414673d653396d2dce2e862b1e3.tar.gz
cuberite-b17d12c86f3e7414673d653396d2dce2e862b1e3.tar.bz2
cuberite-b17d12c86f3e7414673d653396d2dce2e862b1e3.tar.lz
cuberite-b17d12c86f3e7414673d653396d2dce2e862b1e3.tar.xz
cuberite-b17d12c86f3e7414673d653396d2dce2e862b1e3.tar.zst
cuberite-b17d12c86f3e7414673d653396d2dce2e862b1e3.zip
Diffstat (limited to '')
-rw-r--r--zlib-1.2.7/infback.c (renamed from zlib-1.2.5/infback.c)14
1 files changed, 11 insertions, 3 deletions
diff --git a/zlib-1.2.5/infback.c b/zlib-1.2.7/infback.c
index af3a8c965..981aff17c 100644
--- a/zlib-1.2.5/infback.c
+++ b/zlib-1.2.7/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;
@@ -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;
}