cvs: ZendEngine2 / zend_default_classes.c

helly Thu Jan 22 14:53:09 2004 EDT Modified files: /ZendEngine2 zend_default_classes.c Log: Fix internal access to exception properties http://cvs.php.net/diff.php/ZendEngine2/zend_default_classes.c?r1=1.53&r2=1.54&ty=u Index: ZendEngine2/zend_default_classes.c diff -u ZendEngine2/zend_default_classes.c:1.53 ZendEngine2/zend_default_classes.c:1.54 --- ZendEngine2/zend_default_classes.c:1.53 Thu Jan 8 12:31:47 2004 +++ ZendEngine2/zend_default_classes.c Thu Jan 22 14:53:09 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_default_classes.c,v 1.53 2004/01/08 17:31:47 sniper Exp $ */ +/* $Id: zend_default_classes.c,v 1.54 2004/01/22 19:53:09 helly Exp $ */ #include "zend.h" #include "zend_API.h" @@ -47,9 +47,9 @@ trace->refcount = 0; zend_fetch_debug_backtrace(trace, 0 TSRMLS_CC); - zend_update_property_string(class_type, &obj, "file", sizeof("file")-1, zend_get_executed_filename(TSRMLS_C) TSRMLS_CC); - zend_update_property_long(class_type, &obj, "line", sizeof("line")-1, zend_get_executed_lineno(TSRMLS_C) TSRMLS_CC); - zend_update_property(class_type, &obj, "trace", sizeof("trace")-1, trace TSRMLS_CC); + zend_update_property_string(default_exception_ptr, &obj, "file", sizeof("file")-1, zend_get_executed_filename(TSRMLS_C) TSRMLS_CC); + zend_update_property_long(default_exception_ptr, &obj, "line", sizeof("line")-1, zend_get_executed_lineno(TSRMLS_C) TSRMLS_CC); + zend_update_property(default_exception_ptr, &obj, "trace", sizeof("trace")-1, trace TSRMLS_CC); return obj.value.obj; } @@ -74,11 +74,11 @@ object = getThis(); if (message) { - zend_update_property_string(Z_OBJCE_P(object), object, "message", sizeof("message")-1, message TSRMLS_CC); + zend_update_property_string(default_exception_ptr, object, "message", sizeof("message")-1, message TSRMLS_CC); } if (code) { - zend_update_property_long(Z_OBJCE_P(object), object, "code", sizeof("code")-1, code TSRMLS_CC); + zend_update_property_long(default_exception_ptr, object, "code", sizeof("code")-1, code TSRMLS_CC); } } @@ -91,7 +91,7 @@ { zval *value; - value = zend_read_property(Z_OBJCE_P(object), object, name, name_len, 0 TSRMLS_CC); + value = zend_read_property(default_exception_ptr, object, name, name_len, 0 TSRMLS_CC); *return_value = *value; zval_copy_ctor(return_value); @@ -290,7 +290,7 @@ char *res = estrdup(""), **str = &res, *s_tmp; int res_len = 0, *len = &res_len, num = 0; - trace = zend_read_property(Z_OBJCE_P(getThis()), getThis(), "trace", sizeof("trace")-1, 1 TSRMLS_CC); + trace = zend_read_property(default_exception_ptr, getThis(), "trace", sizeof("trace")-1, 1 TSRMLS_CC); zend_hash_apply_with_arguments(Z_ARRVAL_P(trace), (apply_func_args_t)_build_trace_string, 3, str, len, &num); s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 7 + 1); @@ -322,9 +322,9 @@ zend_fcall_info fci; zval fname; - message = zend_read_property(Z_OBJCE_P(getThis()), getThis(), "message", sizeof("message")-1, 1 TSRMLS_CC); - file = zend_read_property(Z_OBJCE_P(getThis()), getThis(), "file", sizeof("file")-1, 1 TSRMLS_CC); - line = zend_read_property(Z_OBJCE_P(getThis()), getThis(), "line", sizeof("line")-1, 1 TSRMLS_CC); + message = zend_read_property(default_exception_ptr, getThis(), "message", sizeof("message")-1, 1 TSRMLS_CC); + file = zend_read_property(default_exception_ptr, getThis(), "file", sizeof("file")-1, 1 TSRMLS_CC); + line = zend_read_property(default_exception_ptr, getThis(), "line", sizeof("line")-1, 1 TSRMLS_CC); ZVAL_STRINGL(&fname, "gettraceasstring", sizeof("gettraceasstring")-1, 0); @@ -427,10 +427,10 @@ if (message) { - zend_update_property_string(exception_ce, ex, "message", sizeof("message")-1, message TSRMLS_CC); + zend_update_property_string(default_exception_ptr, ex, "message", sizeof("message")-1, message TSRMLS_CC); } if (code) { - zend_update_property_long(exception_ce, ex, "code", sizeof("code")-1, code TSRMLS_CC); + zend_update_property_long(default_exception_ptr, ex, "code", sizeof("code")-1, code TSRMLS_CC); } efree(message); @@ -459,10 +459,10 @@ if (message) { - zend_update_property_string(exception_ce, ex, "message", sizeof("message")-1, message TSRMLS_CC); + zend_update_property_string(default_exception_ptr, ex, "message", sizeof("message")-1, message TSRMLS_CC); } if (code) { - zend_update_property_long(exception_ce, ex, "code", sizeof("code")-1, code TSRMLS_CC); + zend_update_property_long(default_exception_ptr, ex, "code", sizeof("code")-1, code TSRMLS_CC); } EG(exception) = ex;