com php-src: This should be better: ext/standard/streamsfuncs.c main/streams/streams.c

Commit: da028e075713c27c08ddb224888c4609d1241465 Author: Xinchen Hui <laruence@gmail.com> Wed, 30 Dec 2015 05:10:05 -0800 Parents: 90d2f509e2164b60fc7bc8407e63504c910cce11 Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=da028e075713c27c08ddb224888c4609d1241465 Log: This should be better Changed paths: M ext/standard/streamsfuncs.c M main/streams/streams.c Diff: diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index bc8c855..235a0cb 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -885,7 +885,6 @@ static int parse_context_options(php_stream_context *context, zval *options) if (Z_TYPE_P(wval) == IS_ARRAY) { ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(wval), okey, oval) { if (okey) { - ZVAL_DEREF(oval); php_stream_context_set_option(context, ZSTR_VAL(wkey), ZSTR_VAL(okey), oval); } } ZEND_HASH_FOREACH_END(); diff --git a/main/streams/streams.c b/main/streams/streams.c index d0f8a44..5e2e42a 100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -2244,9 +2244,8 @@ PHPAPI int php_stream_context_set_option(php_stream_context *context, return FAILURE; } } - if (Z_REFCOUNTED_P(optionvalue)) { - Z_ADDREF_P(optionvalue); - } + ZVAL_DEREF(optionvalue); + Z_TRY_ADDREF_P(optionvalue); return zend_hash_str_update(Z_ARRVAL_P(wrapperhash), optionname, strlen(optionname), optionvalue) ? SUCCESS : FAILURE; } /* }}} */