com php-src: Fixed recently introduced memory leak: ext/standard/http_fopen_wrapper.c

Commit: 28011fd14f9101adcfa92209039be6b218df5195 Author: Dmitry Stogov <dmitry@zend.com> Tue, 14 Apr 2015 14:46:26 +0300 Parents: 26a6d707a18701a51269969ea97b8b9b4d851d8a Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=28011fd14f9101adcfa92209039be6b218df5195 Log: Fixed recently introduced memory leak Changed paths: M ext/standard/http_fopen_wrapper.c Diff: diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c index d5724fe..ae4b137 100644 --- a/ext/standard/http_fopen_wrapper.c +++ b/ext/standard/http_fopen_wrapper.c @@ -670,7 +670,9 @@ finish: } response_header = zend_hash_str_find_ind(symbol_table, "http_response_header", sizeof("http_response_header")-1); - Z_ADDREF_P(response_header); + if (Z_TYPE_P(response_header) != IS_ARRAY) { + goto out; + } if (!php_stream_eof(stream)) { size_t tmp_line_len; @@ -906,10 +908,6 @@ out: if (stream) { if (header_init) { ZVAL_COPY(&stream->wrapperdata, response_header); - } else { - if(response_header) { - Z_DELREF_P(response_header); - } } php_stream_notify_progress_init(context, 0, file_size); @@ -931,9 +929,6 @@ out: php_stream_filter_append(&stream->readfilters, transfer_encoding); } } else { - if(response_header) { - Z_DELREF_P(response_header); - } if (transfer_encoding) { php_stream_filter_free(transfer_encoding); }