archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Show {main} and prevent showing empty stack traces

Browse source
This commit is contained in:
Marcus Boerger 2003-09-01 20:54:48 +00:00
parent 0036ed9064
commit d7fa986db8
2 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Zend/zend_default_classes.c
View file

@ -274,14 +274,19 @@ static int _build_trace_string(zval **frame, int num_args, va_list args, zend_ha
ZEND_METHOD(exception, gettraceasstring) ZEND_METHOD(exception, gettraceasstring)
{ {
zval *trace; zval *trace;
char *str = estrdup(""); char *res = estrdup(""), **str = &res, *s_tmp;
int len = 0, num = 0; 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(Z_OBJCE_P(getThis()), 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); zend_hash_apply_with_arguments(Z_ARRVAL_P(trace), (apply_func_args_t)_build_trace_string, 3, str, len, &num);
str[len] = '\0'; s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 7 + 1);
RETURN_STRINGL(str, len, 0); sprintf(s_tmp, "#%d {main}", num);
TRACE_APPEND_STRL(s_tmp, strlen(s_tmp));
efree(s_tmp);
res[res_len] = '\0';
RETURN_STRINGL(res, res_len, 0);
} }
/* }}} */ /* }}} */
@ -315,7 +320,7 @@ ZEND_METHOD(exception, tostring)
str = emalloc(len); str = emalloc(len);
sprintf(str, "exception '%s' with message '%s' in %s:%ld\nStack trace:\n%s", sprintf(str, "exception '%s' with message '%s' in %s:%ld\nStack trace:\n%s",
Z_OBJCE_P(getThis())->name, Z_STRVAL_P(message), Z_STRVAL_P(file), Z_LVAL_P(line), Z_OBJCE_P(getThis())->name, Z_STRVAL_P(message), Z_STRVAL_P(file), Z_LVAL_P(line),
Z_STRVAL_P(trace)); Z_STRLEN_P(trace) ? Z_STRVAL_P(trace) : "#0 {main}\n");
len = strlen(str); len = strlen(str);
/* We store the result in the private property string so we can access /* We store the result in the private property string so we can access

17
Zend/zend_exceptions.c
View file

@ -274,14 +274,19 @@ static int _build_trace_string(zval **frame, int num_args, va_list args, zend_ha
ZEND_METHOD(exception, gettraceasstring) ZEND_METHOD(exception, gettraceasstring)
{ {
zval *trace; zval *trace;
char *str = estrdup(""); char *res = estrdup(""), **str = &res, *s_tmp;
int len = 0, num = 0; 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(Z_OBJCE_P(getThis()), 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); zend_hash_apply_with_arguments(Z_ARRVAL_P(trace), (apply_func_args_t)_build_trace_string, 3, str, len, &num);
str[len] = '\0'; s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 7 + 1);
RETURN_STRINGL(str, len, 0); sprintf(s_tmp, "#%d {main}", num);
TRACE_APPEND_STRL(s_tmp, strlen(s_tmp));
efree(s_tmp);
res[res_len] = '\0';
RETURN_STRINGL(res, res_len, 0);
} }
/* }}} */ /* }}} */
@ -315,7 +320,7 @@ ZEND_METHOD(exception, tostring)
str = emalloc(len); str = emalloc(len);
sprintf(str, "exception '%s' with message '%s' in %s:%ld\nStack trace:\n%s", sprintf(str, "exception '%s' with message '%s' in %s:%ld\nStack trace:\n%s",
Z_OBJCE_P(getThis())->name, Z_STRVAL_P(message), Z_STRVAL_P(file), Z_LVAL_P(line), Z_OBJCE_P(getThis())->name, Z_STRVAL_P(message), Z_STRVAL_P(file), Z_LVAL_P(line),
Z_STRVAL_P(trace)); Z_STRLEN_P(trace) ? Z_STRVAL_P(trace) : "#0 {main}\n");
len = strlen(str); len = strlen(str);
/* We store the result in the private property string so we can access /* We store the result in the private property string so we can access