diff --git a/skia/third_party/externals/zlib/inflate.c b/skia/third_party/externals/zlib/inflate.c
index 68902e81bd4be9489f361da235bde600859ffa5f..9057a574bb6c6b14cbe447165cf2791e89cb40b8 100644
--- a/skia/third_party/externals/zlib/inflate.c
+++ b/skia/third_party/externals/zlib/inflate.c
@@ -760,8 +760,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);