website/static/security/patches/SA-22:13/zlib.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14

--- sys/contrib/zlib/inflate.c.orig
+++ sys/contrib/zlib/inflate.c
@@ -759,8 +759,9 @@
                 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);