Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 32 additions & 10 deletions ext/standard/array.c
Original file line number Diff line number Diff line change
Expand Up @@ -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, **data, **zcolval, **zkeyval, *zcolumn_copy = NULL, *zkey_copy = NULL, *zkeyval_copy = NULL;
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;
}
Expand All @@ -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");
Expand All @@ -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");
Expand Down Expand Up @@ -2617,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;
Expand All @@ -2636,6 +2646,18 @@ 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);
}
if (zkeyval_copy) {
zval_dtor(zkeyval_copy);
FREE_ZVAL(zkeyval_copy);
}
}
/* }}} */

Expand Down