com php-src: Fixed bug #70250 (extract() turns array elements to references): NEWS ext/standard/array.c ext/standard/tests/array/bug70250.phpt

From: Date: Thu, 13 Aug 2015 05:30:25 +0000
Subject: com php-src: Fixed bug #70250 (extract() turns array elements to references): NEWS ext/standard/array.c ext/standard/tests/array/bug70250.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-88505@lists.php.net to get a copy of this message
Commit: dc5c6ab774ff4f52675a663cb241896ca5d804cf Author: Xinchen Hui <laruence@php.net> Thu, 13 Aug 2015 13:30:25 +0800 Parents: adf0e499121df263c65aa84e1c75a61dd51f0cf3 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=dc5c6ab774ff4f52675a663cb241896ca5d804cf Log: Fixed bug #70250 (extract() turns array elements to references) Bugs: https://bugs.php.net/70250 Changed paths: M NEWS M ext/standard/array.c A ext/standard/tests/array/bug70250.phpt Diff: diff --git a/NEWS b/NEWS index 3741df9..2ed721d 100644 --- a/NEWS +++ b/NEWS @@ -40,6 +40,8 @@ PHP NEWS . Fixed bug #70214 (FASYNC not defined, needs sys/file.h include). (Bob) - Standard: + . Fixed bug #70250 (extract() turns array elements to references). + (Laruence) . Fixed bug #70211 (php 7 ZEND_HASH_IF_FULL_DO_RESIZE use after free). (Laruence) . Fixed bug #70208 (Assert breaking access on objects). (Bob) diff --git a/ext/standard/array..c b/ext/standard/array.c index 7ef9d73..14c4ef5 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -1500,6 +1500,7 @@ PHP_FUNCTION(extract) zend_hash_update(symbol_table, Z_STR(final_name), entry); } } else { + ZVAL_DEREF(entry); if (Z_REFCOUNTED_P(entry)) Z_ADDREF_P(entry); zend_hash_update_ind(symbol_table, Z_STR(final_name), entry); } diff --git a/ext/standard/tests/array/bug70250.phpt b/ext/standard/tests/array/bug70250.phpt new file mode 100644 index 0000000..f185999 --- /dev/null +++ b/ext/standard/tests/array/bug70250.phpt @@ -0,0 +1,21 @@ +--TEST-- +Bug #70250 (extract() turns array elements to references) +--FILE-- +<?php +$array = ['key' => 'value']; + +$ref = &$array['key']; + +unset($ref); + +extract($array); + +$key = "bad"; + +var_dump($array); +?> +--EXPECT-- +array(1) { + ["key"]=> + string(5) "value" +}

« previous php.cvs (#88505) next »