archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- Use object handler get in the same way as the rest of the engine does

Browse source
This commit is contained in:
Marcus Boerger 2006-03-02 00:40:19 +00:00
parent 52fe090ef0
commit cd35eae1aa
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Zend/zend.c
View file

@ -358,16 +358,19 @@ ZEND_API void zend_make_string_zval(zval *expr, zval *expr_copy, int *use_copy)
} }
if (Z_OBJ_HANDLER_P(expr, get)) { if (Z_OBJ_HANDLER_P(expr, get)) {
zval *z = Z_OBJ_HANDLER_P(expr, get)(expr TSRMLS_CC); zval *z = Z_OBJ_HANDLER_P(expr, get)(expr TSRMLS_CC);
z->refcount++;
if(Z_TYPE_P(z) != IS_OBJECT) { if(Z_TYPE_P(z) != IS_OBJECT) {
zend_make_string_zval(z, expr_copy, use_copy); zend_make_string_zval(z, expr_copy, use_copy);
if (*use_copy) { if (*use_copy) {
FREE_ZVAL(z); zval_ptr_dtor(&z);
} else { } else {
ZVAL_ZVAL(expr_copy, z, 0, 1); ZVAL_ZVAL(expr_copy, z, 0, 1);
*use_copy = 1; *use_copy = 1;
} }
return; return;
} }
zval_ptr_dtor(&z);
} }
zend_error(EG(exception) ? E_ERROR : E_RECOVERABLE_ERROR, "Object of class %v could not be converted to string", Z_OBJCE_P(expr)->name); zend_error(EG(exception) ? E_ERROR : E_RECOVERABLE_ERROR, "Object of class %v could not be converted to string", Z_OBJCE_P(expr)->name);
ZVAL_EMPTY_STRING(expr_copy); ZVAL_EMPTY_STRING(expr_copy);
@ -424,16 +427,19 @@ ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_cop
} }
if (Z_OBJ_HANDLER_P(expr, get)) { if (Z_OBJ_HANDLER_P(expr, get)) {
zval *z = Z_OBJ_HANDLER_P(expr, get)(expr TSRMLS_CC); zval *z = Z_OBJ_HANDLER_P(expr, get)(expr TSRMLS_CC);
z->refcount++;
if(Z_TYPE_P(z) != IS_OBJECT) { if(Z_TYPE_P(z) != IS_OBJECT) {
zend_make_printable_zval(z, expr_copy, use_copy); zend_make_printable_zval(z, expr_copy, use_copy);
if (*use_copy) { if (*use_copy) {
FREE_ZVAL(z); zval_ptr_dtor(&z);
} else { } else {
ZVAL_ZVAL(expr_copy, z, 0, 1); ZVAL_ZVAL(expr_copy, z, 0, 1);
*use_copy = 1; *use_copy = 1;
} }
return; return;
} }
zval_ptr_dtor(&z);
} }
zend_error(EG(exception) ? E_ERROR : E_RECOVERABLE_ERROR, "Object of class %v could not be converted to string", Z_OBJCE_P(expr)->name); zend_error(EG(exception) ? E_ERROR : E_RECOVERABLE_ERROR, "Object of class %v could not be converted to string", Z_OBJCE_P(expr)->name);
ZVAL_EMPTY_STRING(expr_copy); ZVAL_EMPTY_STRING(expr_copy);
@ -473,16 +479,19 @@ ZEND_API void zend_make_unicode_zval(zval *expr, zval *expr_copy, int *use_copy)
} }
if (Z_OBJ_HANDLER_P(expr, get)) { if (Z_OBJ_HANDLER_P(expr, get)) {
zval *z = Z_OBJ_HANDLER_P(expr, get)(expr TSRMLS_CC); zval *z = Z_OBJ_HANDLER_P(expr, get)(expr TSRMLS_CC);
z->refcount++;
if(Z_TYPE_P(z) != IS_OBJECT) { if(Z_TYPE_P(z) != IS_OBJECT) {
zend_make_unicode_zval(z, expr_copy, use_copy); zend_make_unicode_zval(z, expr_copy, use_copy);
if (*use_copy) { if (*use_copy) {
FREE_ZVAL(z); zval_ptr_dtor(&z);
} else { } else {
ZVAL_ZVAL(expr_copy, z, 0, 1); ZVAL_ZVAL(expr_copy, z, 0, 1);
*use_copy = 1; *use_copy = 1;
} }
return; return;
} }
zval_ptr_dtor(&z);
} }
zend_error(EG(exception) ? E_ERROR : E_RECOVERABLE_ERROR, "Object of class %v could not be converted to string", Z_OBJCE_P(expr)->name); zend_error(EG(exception) ? E_ERROR : E_RECOVERABLE_ERROR, "Object of class %v could not be converted to string", Z_OBJCE_P(expr)->name);
ZVAL_EMPTY_UNICODE(expr_copy); ZVAL_EMPTY_UNICODE(expr_copy);