From 6c5f0338c8306d8bf2512de974fd707349c662a4 Mon Sep 17 00:00:00 2001 From: Jakub Zelenka Date: Sun, 31 Mar 2013 20:41:02 +0100 Subject: [PATCH 1/2] Fix object casting bug in array_column --- ext/standard/array.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/ext/standard/array.c b/ext/standard/array.c index 226bfefc5bed..c77ed31d1e02 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -2529,13 +2529,13 @@ PHP_FUNCTION(array_count_values) value_key and optionally indexed by the index_key */ PHP_FUNCTION(array_column) { - zval *zarray, *zcolumn, *zkey = NULL, **data, **zcolval, **zkeyval; + zval *zarray, *zcolumn, *zkey = NULL, *zcolumn_copy = NULL, *zkey_copy = NULL, **data, **zcolval, **zkeyval; HashTable *arr_hash; HashPosition pointer; ulong column_idx = 0, key_idx = 0; char *column = NULL, *key = NULL, *keyval = NULL; int column_len = 0, key_len = 0, keyval_idx = -1; - + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "az|z", &zarray, &zcolumn, &zkey) == FAILURE) { return; } @@ -2552,9 +2552,11 @@ PHP_FUNCTION(array_column) column_len = Z_STRLEN_P(zcolumn); break; case IS_OBJECT: - convert_to_string(zcolumn); - column = Z_STRVAL_P(zcolumn); - column_len = Z_STRLEN_P(zcolumn); + MAKE_STD_ZVAL(zcolumn_copy); + ZVAL_ZVAL(zcolumn_copy, zcolumn, 1, 0); + convert_to_string(zcolumn_copy); + column = Z_STRVAL_P(zcolumn_copy); + column_len = Z_STRLEN_P(zcolumn_copy); break; default: php_error_docref(NULL TSRMLS_CC, E_WARNING, "The column key should be either a string or an integer"); @@ -2574,9 +2576,11 @@ PHP_FUNCTION(array_column) key_len = Z_STRLEN_P(zkey); break; case IS_OBJECT: - convert_to_string(zkey); - key = Z_STRVAL_P(zkey); - key_len = Z_STRLEN_P(zkey); + MAKE_STD_ZVAL(zkey_copy); + ZVAL_ZVAL(zkey_copy, zkey, 1, 0); + convert_to_string(zkey_copy); + key = Z_STRVAL_P(zkey_copy); + key_len = Z_STRLEN_P(zkey_copy); break; default: php_error_docref(NULL TSRMLS_CC, E_WARNING, "The index key should be either a string or an integer"); @@ -2636,6 +2640,14 @@ PHP_FUNCTION(array_column) } } + if (zcolumn_copy) { + zval_dtor(zcolumn_copy); + FREE_ZVAL(zcolumn_copy); + } + if (zkey_copy) { + zval_dtor(zkey_copy); + FREE_ZVAL(zkey_copy); + } } /* }}} */ From be73d80da180e0139ffa7aa9ec35321f86d062f5 Mon Sep 17 00:00:00 2001 From: Jakub Zelenka Date: Sun, 31 Mar 2013 21:46:16 +0100 Subject: [PATCH 2/2] Fix array_column zkeyval object casting --- ext/standard/array.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/ext/standard/array.c b/ext/standard/array.c index c77ed31d1e02..70e68e0579bc 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -2529,7 +2529,7 @@ PHP_FUNCTION(array_count_values) value_key and optionally indexed by the index_key */ PHP_FUNCTION(array_column) { - zval *zarray, *zcolumn, *zkey = NULL, *zcolumn_copy = NULL, *zkey_copy = NULL, **data, **zcolval, **zkeyval; + zval *zarray, *zcolumn, *zkey = NULL, **data, **zcolval, **zkeyval, *zcolumn_copy = NULL, *zkey_copy = NULL, *zkeyval_copy = NULL; HashTable *arr_hash; HashPosition pointer; ulong column_idx = 0, key_idx = 0; @@ -2621,8 +2621,14 @@ PHP_FUNCTION(array_column) keyval = Z_STRVAL_PP(zkeyval); break; case IS_OBJECT: - convert_to_string(*zkeyval); - keyval = Z_STRVAL_PP(zkeyval); + if (!zkeyval_copy) { + MAKE_STD_ZVAL(zkeyval_copy); + } else { + zval_dtor(zkeyval_copy); + } + ZVAL_ZVAL(zkeyval_copy, *zkeyval, 1, 0) + convert_to_string(zkeyval_copy); + keyval = Z_STRVAL_P(zkeyval_copy); break; default: keyval_idx = -1; @@ -2648,6 +2654,10 @@ PHP_FUNCTION(array_column) zval_dtor(zkey_copy); FREE_ZVAL(zkey_copy); } + if (zkeyval_copy) { + zval_dtor(zkeyval_copy); + FREE_ZVAL(zkeyval_copy); + } } /* }}} */