com php-src: Duplicate array only if neccessary: ext/standard/array.c
| From: | Dmitry Stogov | Date: | Thu, 28 Aug 2014 16:51:22 +0000 |
| Subject: | com php-src: Duplicate array only if neccessary: ext/standard/array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81269@lists.php.net to get a copy of this message | ||
Commit: c8ff3421a0531a596e7761d50062c3e270c11535
Author: Dmitry Stogov <dmitry@zend.com> Thu, 28 Aug 2014 20:51:22 +0400
Parents: 7faac0267fe2fe048e16f2be8eb46c7c56f5dc8c
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c8ff3421a0531a596e7761d50062c3e270c11535
Log:
Duplicate array only if neccessary
Changed paths:
M ext/standard/array.c
Diff:
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 81ecfd7..09aaddf 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -1365,11 +1365,14 @@ PHP_FUNCTION(extract)
int extract_refs = 0;
zend_array *symbol_table;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/|lz/", &var_array,
&extract_type, &prefix) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|lz/", &var_array,
&extract_type, &prefix) == FAILURE) {
return;
}
extract_refs = (extract_type & EXTR_REFS);
+ if (extract_refs) {
+ SEPARATE_ZVAL(var_array);
+ }
extract_type &= 0xff;
if (extract_type < EXTR_OVERWRITE || extract_type > EXTR_IF_EXISTS) {