diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2017-03-14 22:17:10 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2017-03-14 22:17:10 +0100 |
| commit | 3d4e954518e467ae6853ee2d22defa35b32b2c73 (patch) | |
| tree | 0e92a3c5702a7247d8ca1ca4957ab0e87f87b3bd /main/streams/streams.c | |
| parent | b4f0174e5caded1aecfd5231dd84c02b4c6bbd91 (diff) | |
| parent | 8be63ce0e2046e67e403f5ccd5aa06ecdd94e25c (diff) | |
| download | php-git-3d4e954518e467ae6853ee2d22defa35b32b2c73.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'main/streams/streams.c')
| -rw-r--r-- | main/streams/streams.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c index 0ad72a6433..93ac083559 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; } /* }}} */ |