com php-src: Fixed refcounting: ext/standard/streamsfuncs.c

From: Date: Fri, 14 Mar 2014 11:54:49 +0000
Subject: com php-src: Fixed refcounting: ext/standard/streamsfuncs.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-77645@lists.php.net to get a copy of this message
Commit: c094fc11bea5bb733edb31aaa044b70ac5dc2d59 Author: Dmitry Stogov <dmitry@zend.com> Fri, 14 Mar 2014 15:54:49 +0400 Parents: 51494f252f1a2edf1aa2a13925d318a922c4a1aa Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c094fc11bea5bb733edb31aaa044b70ac5dc2d59 Log: Fixed refcounting Changed paths: M ext/standard/streamsfuncs.c Diff: diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index d7ada0d..197f55b 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -952,7 +952,7 @@ static int parse_context_params(php_stream_context *context, zval *params TSRMLS context->notifier = php_stream_notification_alloc(); context->notifier->func = user_space_stream_notifier; context->notifier->ptr = tmp; - Z_ADDREF_P(tmp); + if (Z_REFCOUNTED_P(tmp)) Z_ADDREF_P(tmp); context->notifier->dtor = user_space_stream_notifier_dtor; } if (NULL != (tmp = zend_hash_str_find(Z_ARRVAL_P(params), "options", sizeof("options")-1))) { @@ -1092,7 +1092,7 @@ PHP_FUNCTION(stream_context_get_params) array_init(return_value); if (context->notifier && context->notifier->ptr && context->notifier->func == user_space_stream_notifier) { add_assoc_zval_ex(return_value, ZEND_STRS("notification"), context->notifier->ptr); - Z_ADDREF_P(context->notifier->ptr); + if (Z_REFCOUNTED_P((zval*)context->notifier->ptr)) Z_ADDREF_P(context->notifier->ptr); } ZVAL_ZVAL(&options, &context->options, 1, 0); add_assoc_zval_ex(return_value, ZEND_STRS("options"), &options);

« previous php.cvs (#77645) next »