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

Avoid crashing if an error occurs before we open the first file.

Browse source
This commit is contained in:
Zeev Suraski 1999-05-25 22:55:13 +00:00
parent cf58b7ef16
commit 033858e13d
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Zend/zend_execute_API.c
View file

@ -111,6 +111,8 @@ void init_executor(CLS_D ELS_DC)
globals->is_ref = 0;
zend_hash_update(&EG(symbol_table), "GLOBALS", sizeof("GLOBALS"), &globals, sizeof(zval *), NULL);
}
EG(opline_ptr) = NULL;
}
@ -164,13 +166,21 @@ ZEND_API char *get_active_function_name(ELS_D)
ZEND_API char *zend_get_executed_filename(ELS_D)
{
return active_opline->filename;
if (EG(opline_ptr)) {
return active_opline->filename;
} else {
return "[no active file]";
}
}
ZEND_API uint zend_get_executed_lineno(ELS_D)
{
return active_opline->lineno;
if (EG(opline_ptr)) {
return active_opline->lineno;
} else {
return 0;
}
}