From: Michael Wallner <mike@php.net>
Date: Tue, 29 Dec 2009 12:21:24 +0000 (+0000)
Subject: MFPHP: choke on Z_OK if we expect Z_STREAM_END
X-Git-Tag: RELEASE_1_7_0b2~4
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=2b9bcedabdd05c42571a4ccb18855e84cd4d89be;p=m6w6%2Fext-http

MFPHP: choke on Z_OK if we expect Z_STREAM_END
---

diff --git a/http_encoding_api.c b/http_encoding_api.c
index c644d91..9159106 100644
--- a/http_encoding_api.c
+++ b/http_encoding_api.c
@@ -327,10 +327,13 @@ retry_raw_inflate:
 		Z.avail_in = data_len;
 		
 		switch (status = http_inflate_rounds(&Z, Z_NO_FLUSH, decoded, decoded_len)) {
-			case Z_OK:
 			case Z_STREAM_END:
 				inflateEnd(&Z);
 				return SUCCESS;
+
+			case Z_OK:
+				status = Z_DATA_ERROR;
+				break;
 			
 			case Z_DATA_ERROR:
 				/* raw deflated data? */