| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2006, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2007, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
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? */
}
}
inflateEnd(&Z);
+
+ if (decoded_len && *decoded) {
+ efree(*decoded);
+ }
}
http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not inflate data: %s", zError(status));
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) {
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) {