archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 14:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed bug #34137 (assigning array element by reference causes binary mess)

Browse source
This commit is contained in:
Dmitry Stogov 2005-09-01 13:21:04 +00:00
parent 176a76dbec
commit bd307bc0bd
3 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -22,5 +22,7 @@ PHP NEWS
(Derick) (Derick)
- Fixed bug #34277 (array_filter() crashes with references and objects). - Fixed bug #34277 (array_filter() crashes with references and objects).
(Dmitry) (Dmitry)
- Fixed bug #34137 (assigning array element by reference causes binary mess).
(Dmitry)
- Fixed bug #33957 (gmdate('W')/date('W') sometimes returns wrong week number). - Fixed bug #33957 (gmdate('W')/date('W') sometimes returns wrong week number).
(Derick) (Derick)

10
Zend/tests/bug34137.phpt Executable file
View file

@ -0,0 +1,10 @@
--TEST--
Bug #34137 (assigning array element by reference causes binary mess)
--FILE--
<?php
$arr1 = array('a1' => array('alfa' => 'ok'));
$arr1 =& $arr1['a1'];
echo '-'.$arr1['alfa']."-\n";
?>
--EXPECT--
-ok-

12
Zend/zend_execute.c
View file

@ -415,12 +415,6 @@ static void zend_assign_to_variable_reference(zval **variable_ptr_ptr, zval **va
if (variable_ptr == EG(error_zval_ptr) || value_ptr==EG(error_zval_ptr)) { if (variable_ptr == EG(error_zval_ptr) || value_ptr==EG(error_zval_ptr)) {
variable_ptr_ptr = &EG(uninitialized_zval_ptr); variable_ptr_ptr = &EG(uninitialized_zval_ptr);
} else if (variable_ptr != value_ptr) { } else if (variable_ptr != value_ptr) {
variable_ptr->refcount--;
if (variable_ptr->refcount==0) {
zendi_zval_dtor(*variable_ptr);
FREE_ZVAL(variable_ptr);
}
if (!PZVAL_IS_REF(value_ptr)) { if (!PZVAL_IS_REF(value_ptr)) {
/* break it away */ /* break it away */
value_ptr->refcount--; value_ptr->refcount--;
@ -436,6 +430,12 @@ static void zend_assign_to_variable_reference(zval **variable_ptr_ptr, zval **va
*variable_ptr_ptr = value_ptr; *variable_ptr_ptr = value_ptr;
value_ptr->refcount++; value_ptr->refcount++;
variable_ptr->refcount--;
if (variable_ptr->refcount==0) {
zendi_zval_dtor(*variable_ptr);
FREE_ZVAL(variable_ptr);
}
} else if (!variable_ptr->is_ref) { } else if (!variable_ptr->is_ref) {
if (variable_ptr_ptr == value_ptr_ptr) { if (variable_ptr_ptr == value_ptr_ptr) {
SEPARATE_ZVAL(variable_ptr_ptr); SEPARATE_ZVAL(variable_ptr_ptr);