summaryrefslogtreecommitdiff
path: root/main/streams/streams.c
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2017-03-14 22:17:23 +0100
committerBob Weinand <bobwei9@hotmail.com>2017-03-14 22:17:23 +0100
commitb6524f83e2c097ba9f32e84e2d7d38b2bee11d88 (patch)
treee9aa62140d49fa076994b21af43521c3395b72dd /main/streams/streams.c
parent117d6a9a14c28968485247fdbc53128e46b98ab3 (diff)
parent3d4e954518e467ae6853ee2d22defa35b32b2c73 (diff)
downloadphp-git-b6524f83e2c097ba9f32e84e2d7d38b2bee11d88.tar.gz
Merge branch 'PHP-7.1'
Diffstat (limited to 'main/streams/streams.c')
-rw-r--r--main/streams/streams.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c
index 4f9fabe434..25898cd2c4 100644
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -2231,6 +2231,7 @@ PHPAPI int php_stream_context_set_option(php_stream_context *context,
zval *wrapperhash;
zval category;
+ SEPARATE_ARRAY(&context->options);
wrapperhash = zend_hash_str_find(Z_ARRVAL(context->options), wrappername, strlen(wrappername));
if (NULL == wrapperhash) {
array_init(&category);
@@ -2241,6 +2242,7 @@ PHPAPI int php_stream_context_set_option(php_stream_context *context,
}
ZVAL_DEREF(optionvalue);
Z_TRY_ADDREF_P(optionvalue);
+ SEPARATE_ARRAY(wrapperhash);
return zend_hash_str_update(Z_ARRVAL_P(wrapperhash), optionname, strlen(optionname), optionvalue) ? SUCCESS : FAILURE;
}
/* }}} */