!42 security: Fix CVE-2022-37434

Merge pull request !42 from wanghang/master

!42 security: Fix CVE-2022-37434
Merge pull request !42 from wanghang/master
1a040360 · openharmony_ci · Gitee · 7c9e1c3c · ae3b7fcc · 1a040360
隐藏空白更改
内联并排

Showing with 3 addition and 2 deletion

inflate.c inflate.c +3 -2

未找到文件。
--- a/inflate.c
+++ b/inflate.c
@@ -764,8 +764,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);