From: Michael Wallner <mike@php.net>
Date: Wed, 14 Sep 2016 10:56:01 +0000 (+0200)
Subject: Merge branch 'v2.6.x'
X-Git-Tag: RELEASE_3_1_0_RC1~25
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=b41323e1817c50d062b27da798c7db35fa58212c;hp=d5c7f974d81c724c6fad8b54f1c37ce0795119de;p=m6w6%2Fext-http

Merge branch 'v2.6.x'
---

diff --git a/src/php_http_encoding.c b/src/php_http_encoding.c
index db364b3..83d1794 100644
--- 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;