Fix stream context changes leaking into copies of previous context

bwoebi · bwoebi · commit 8be63ce0e204 · 2017-03-14T22:15:41.000+01:00
diff --git 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;
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -2231,6 +2231,7 @@ PHPAPI int php_stream_context_set_option(php_stream_context *context,`
`2231`	`2231`	`zval *wrapperhash;`
`2232`	`2232`	`zval category;`
`2233`	`2233`
	`2234`	`+ SEPARATE_ARRAY(&context->options);`
`2234`	`2235`	`wrapperhash = zend_hash_str_find(Z_ARRVAL(context->options), wrappername, strlen(wrappername));`
`2235`	`2236`	`if (NULL == wrapperhash) {`
`2236`	`2237`	`array_init(&category);`
`@@ -2241,6 +2242,7 @@ PHPAPI int php_stream_context_set_option(php_stream_context *context,`
`2241`	`2242`	`}`
`2242`	`2243`	`ZVAL_DEREF(optionvalue);`
`2243`	`2244`	`Z_TRY_ADDREF_P(optionvalue);`
	`2245`	`+ SEPARATE_ARRAY(wrapperhash);`
`2244`	`2246`	`return zend_hash_str_update(Z_ARRVAL_P(wrapperhash), optionname, strlen(optionname), optionvalue) ? SUCCESS : FAILURE;`
`2245`	`2247`	`}`
`2246`	`2248`	`/* }}} */`