[ZLIB] Update to v1.2.13. CORE-18752

[reactos.git] / sdk / lib / 3rdparty / zlib / inflate.c

diff --git a/sdk/lib/3rdparty/zlib/inflate.c b/sdk/lib/3rdparty/zlib/inflate.c
index 7be8c63..8acbef4 100644 (file)
--- a/sdk/lib/3rdparty/zlib/inflate.c
+++ b/sdk/lib/3rdparty/zlib/inflate.c
@@ -168,6 +168,8 @@ int windowBits;
 
     /* extract wrap request from windowBits parameter */
     if (windowBits < 0) {
+        if (windowBits < -15)
+            return Z_STREAM_ERROR;
         wrap = 0;
         windowBits = -windowBits;
     }
@@ -764,8 +766,9 @@ int flush;
                 if (copy > have) copy = have;
                 if (copy) {
                     if (state->head != Z_NULL &&
-                        state->head->extra != Z_NULL) {
-                        len = state->head->extra_len - state->length;
+                        state->head->extra != Z_NULL &&
+                        (len = state->head->extra_len - state->length) <
+                            state->head->extra_max) {
                         zmemcpy(state->head->extra + len, next,
                                 len + copy > state->head->extra_max ?
                                 state->head->extra_max - len : copy);