diff options
| author | Marcus Boerger <helly@php.net> | 2003-11-08 14:06:08 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2003-11-08 14:06:08 +0000 |
| commit | 316854323d63ed98cb0ce289a5ffd17f9ee938d0 (patch) | |
| tree | f70748696fd9420dd73445493f3dccf5e05b9759 /Zend/zend.c | |
| parent | ed451570470ebaf24ffe2a2d20403c6749d32318 (diff) | |
| download | php-git-316854323d63ed98cb0ce289a5ffd17f9ee938d0.tar.gz | |
Handle exceptions in casting more gracefully.
This fixes bug #26166
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 2e5d37cfc8..fe0070d4aa 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -230,6 +230,12 @@ ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_cop if (expr->value.obj.handlers->cast_object(expr, expr_copy, IS_STRING, 0 TSRMLS_CC) == SUCCESS) { break; } + if (EG(exception)) { + zval_dtor(expr_copy); + expr_copy->value.str.len = 0; + expr_copy->value.str.val = empty_string; + break; + } } expr_copy->value.str.val = (char *) emalloc(sizeof("Object id #")-1 + MAX_LENGTH_OF_LONG); expr_copy->value.str.len = sprintf(expr_copy->value.str.val, "Object id #%ld", (long)expr->value.obj.handle); |