clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ArrayObject

Browse Source
This commit is contained in:
Marcus Boerger 2004-02-12 20:52:48 +00:00
parent 4127b304ea
commit ab1e2e7c06
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ext/spl/spl_array.c
View File

@ -152,7 +152,7 @@ static zend_object_value spl_array_object_clone(zval *zobject TSRMLS_DC)
/* }}} */
/* {{{ spl_array_read_dimension */
static zval *spl_array_read_dimension(zval *object, zval *offset TSRMLS_DC)
static zval *spl_array_read_dimension(zval *object, zval *offset, int type TSRMLS_DC)
{
spl_array_object *intern = (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
zval **retval;
@ -161,9 +161,10 @@ static zval *spl_array_read_dimension(zval *object, zval *offset TSRMLS_DC)
switch(Z_TYPE_P(offset)) {
case IS_STRING:
if (zend_symtable_find(HASH_OF(intern->array), Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void **) &retval) == FAILURE) {
zend_error(E_NOTICE,"Undefined index: %s", Z_STRVAL_P(offset));
zend_error(E_NOTICE, "Undefined index: %s", Z_STRVAL_P(offset));
return EG(uninitialized_zval_ptr);
} else {
(*retval)->refcount++;
return *retval;
}
case IS_DOUBLE:
@ -176,7 +177,7 @@ static zval *spl_array_read_dimension(zval *object, zval *offset TSRMLS_DC)
index = Z_LVAL_P(offset);
}
if (zend_hash_index_find(HASH_OF(intern->array), index, (void **) &retval) == FAILURE) {
zend_error(E_NOTICE,"Undefined offset: %ld", Z_LVAL_P(offset));
zend_error(E_NOTICE, "Undefined offset: %ld", Z_LVAL_P(offset));
return EG(uninitialized_zval_ptr);
} else {
return *retval;
@ -197,6 +198,11 @@ static void spl_array_write_dimension(zval *object, zval *offset, zval *value TS
switch(Z_TYPE_P(offset)) {
case IS_STRING:
if (!value->is_ref) {
value->refcount++;
} else {
SEPARATE_ZVAL_IF_NOT_REF(&value);
}
zend_symtable_update(HASH_OF(intern->array), Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void**)&value, sizeof(void*), NULL);
return;
case IS_DOUBLE:
@ -208,6 +214,11 @@ static void spl_array_write_dimension(zval *object, zval *offset, zval *value TS
} else {
index = Z_LVAL_P(offset);
}
if (!value->is_ref) {
value->refcount++;
} else {
SEPARATE_ZVAL_IF_NOT_REF(&value);
}
add_index_zval(intern->array, index, value);
return;
default:

17
ext/spl/tests/array_object.phpt
View File

@ -30,8 +30,9 @@ unset($ar[7]);
unset($ar["c"]);
var_dump($ar);
echo "Done\n";
?>
===DONE===
<?php exit(0); ?>
--EXPECTF--
object(ArrayObject)#1 (2) {
[0]=>
@ -47,9 +48,9 @@ array(6) {
[1]=>
int(1)
[2]=>
&int(2)
int(2)
[3]=>
&int(3)
int(3)
[4]=>
int(4)
[5]=>
@ -62,11 +63,11 @@ object(ArrayObject)#1 (5) {
[1]=>
int(1)
[2]=>
&int(2)
int(2)
[3]=>
&int(3)
int(3)
["a"]=>
&string(1) "a"
string(1) "a"
}
int(0)
@ -83,6 +84,6 @@ object(ArrayObject)#1 (2) {
[0]=>
int(0)
[2]=>
&int(2)
int(2)
}
Done
===DONE===