php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-29 11:42:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.0'

Browse Source 
* PHP-8.0:
  Fix function/file mixup in backtrace printing
This commit is contained in:
Nikita Popov
2021-04-13 16:34:17 +02:00
parent cbcfd86026 6fd13d0afd
commit 91908bcd52
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Zend/tests/bug63762.phpt
View File

@@ -39,7 +39,7 @@ string(36) "#0 [internal function]: ()
Array of array of NULL values:
Warning: Function name is not a string in %s on line %d
Warning: File name is not a string in %s on line %d
Warning: Value for class is not a string in %s on line %d
@@ -48,5 +48,5 @@ Warning: Value for type is not a string in %s on line %d
Warning: Value for function is not a string in %s on line %d
Warning: args element is not an array in %s on line %d
string(60) "#0 [unknown function][unknown][unknown][unknown]()
string(58) "#0 [unknown file]: [unknown][unknown][unknown]()
#1 {main}"

9
Zend/zend_exceptions.c
View File

@@ -550,20 +550,17 @@ static void _build_trace_string(smart_str *str, HashTable *ht, uint32_t num) /*
file = zend_hash_find_ex(ht, ZSTR_KNOWN(ZEND_STR_FILE), 1);
if (file) {
if (Z_TYPE_P(file) != IS_STRING) {
zend_error(E_WARNING, "Function name is not a string");
smart_str_appends(str, "[unknown function]");
zend_error(E_WARNING, "File name is not a string");
smart_str_appends(str, "[unknown file]: ");
} else{
zend_long line;
zend_long line = 0;
tmp = zend_hash_find_ex(ht, ZSTR_KNOWN(ZEND_STR_LINE), 1);
if (tmp) {
if (Z_TYPE_P(tmp) == IS_LONG) {
line = Z_LVAL_P(tmp);
} else {
zend_error(E_WARNING, "Line is not an int");
line = 0;
}
} else {
line = 0;
}
smart_str_append(str, Z_STR_P(file));
smart_str_appendc(str, '(');