VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Common/zlib/inflate.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/Common/zlib/inflate.c')
-rw-r--r--src/Common/zlib/inflate.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/Common/zlib/inflate.c b/src/Common/zlib/inflate.c
index 7be8c636..8acbef44 100644
--- a/src/Common/zlib/inflate.c
+++ b/src/Common/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);