* attempt to fix pecl Bug #16826 http_date strange behavior and crash

[m6w6/ext-http] / http_encoding_api.c

diff --git a/http_encoding_api.c b/http_encoding_api.c
index 7a6b04311e71cb1c602cd0d02c42f1422d9b1138..3a93a19729f9c9405860eb5a9f80f1c71d38b909 100644 (file)
--- 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? */
@@ -341,6 +344,10 @@ retry_raw_inflate:
                                }
                }
                inflateEnd(&Z);
+
+               if (decoded_len && *decoded) {
+                       efree(*decoded);
+               }
        }
        
        http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not inflate data: %s", zError(status));
@@ -694,7 +701,10 @@ void _http_ob_deflatehandler(char *output, uint output_len, char **handled_outpu
        
        if (HTTP_G->send.deflate.stream) {
                if (output_len) {
-                       http_encoding_deflate_stream_update((http_encoding_stream *) HTTP_G->send.deflate.stream, output, output_len, handled_output, handled_output_len);
+                       size_t tmp_len;
+                       
+                       http_encoding_deflate_stream_update((http_encoding_stream *) HTTP_G->send.deflate.stream, output, output_len, handled_output, &tmp_len);
+                       *handled_output_len = tmp_len;
                }
                
                if (mode & PHP_OUTPUT_HANDLER_END) {
@@ -733,7 +743,10 @@ void _http_ob_inflatehandler(char *output, uint output_len, char **handled_outpu
        
        if (HTTP_G->send.inflate.stream) {
                if (output_len) {
-                       http_encoding_inflate_stream_update((http_encoding_stream *) HTTP_G->send.inflate.stream, output, output_len, handled_output, handled_output_len);
+                       size_t tmp_len;
+                       
+                       http_encoding_inflate_stream_update((http_encoding_stream *) HTTP_G->send.inflate.stream, output, output_len, handled_output, &tmp_len);
+                       *handled_output_len = tmp_len;
                }
                
                if (mode & PHP_OUTPUT_HANDLER_END) {