Merge branch 'v2.6.x'

[m6w6/ext-http] / src / php_http_encoding.c

diff --git a/src/php_http_encoding.c b/src/php_http_encoding.c
index db364b3858e3273d339696bf89c5fe16ea317388..83d17947790c106abfc8702f3ac975d8aa5b15ba 100644 (file)
--- a/src/php_http_encoding.c
+++ b/src/php_http_encoding.c
@@ -262,10 +262,9 @@ php_http_encoding_stream_t *php_http_encoding_stream_init(php_http_encoding_stre
 php_http_encoding_stream_t *php_http_encoding_stream_copy(php_http_encoding_stream_t *from, php_http_encoding_stream_t *to)
 {
        if (from->ops->copy) {
-               int freeme;
                php_http_encoding_stream_t *ns;
 
-               if ((freeme = !to)) {
+               if (!to) {
                        to = pemalloc(sizeof(*to), (from->flags & PHP_HTTP_ENCODING_STREAM_PERSISTENT));
                }
                memset(to, 0, sizeof(*to));
@@ -278,10 +277,6 @@ php_http_encoding_stream_t *php_http_encoding_stream_copy(php_http_encoding_stre
                } else {
                        return to;
                }
-
-               if (freeme) {
-                       pefree(to, (to->flags & PHP_HTTP_ENCODING_STREAM_PERSISTENT));
-               }
        }
 
        return NULL;