php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-03 14:12:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.5'

Browse Source 
* PHP-5.5:
  Fix array_colum segfault
This commit is contained in:
David Soria Parra
2013-05-15 14:43:03 +02:00
parent 8fa8591cfa 139e9824ad
commit c5841f8cb7
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ext/standard/array.c
View File

@@ -2608,11 +2608,9 @@ PHP_FUNCTION(array_column)
} else if (zkeyval && Z_TYPE_PP(zkeyval) == IS_LONG) {
add_index_zval(return_value, Z_LVAL_PP(zkeyval), *zcolval);
} else if (zkeyval && Z_TYPE_PP(zkeyval) == IS_OBJECT) {
zval copyval;
ZVAL_ZVAL(&copyval, *zkeyval, 1, 0);
convert_to_string(&copyval);
add_assoc_zval(return_value, Z_STRVAL(copyval), *zcolval);
zval_dtor(&copyval);
SEPARATE_ZVAL(zkeyval);
convert_to_string(*zkeyval);
add_assoc_zval(return_value, Z_STRVAL_PP(zkeyval), *zcolval);
} else {
add_next_index_zval(return_value, *zcolval);
}