Skip to content

Commit aaa013d

Browse files
committed
address second round of PR comments
1 parent 3b9bd2f commit aaa013d

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

Zend/zend.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,6 @@ static ZEND_INI_MH(OnUpdateErrorReporting) /* {{{ */
119119
}
120120
/* }}} */
121121

122-
static ZEND_INI_MH(OnUpdateFatalErrorBacktraces)
123-
{
124-
EG(fatal_error_backtraces) = zend_ini_parse_bool(new_value);
125-
126-
return SUCCESS;
127-
}
128-
129122
static ZEND_INI_MH(OnUpdateGCEnabled) /* {{{ */
130123
{
131124
bool val;
@@ -267,7 +260,7 @@ static ZEND_INI_MH(OnUpdateFiberStackSize) /* {{{ */
267260

268261
ZEND_INI_BEGIN()
269262
ZEND_INI_ENTRY("error_reporting", NULL, ZEND_INI_ALL, OnUpdateErrorReporting)
270-
ZEND_INI_ENTRY("fatal_error_backtraces", "1", ZEND_INI_ALL, OnUpdateFatalErrorBacktraces)
263+
STD_ZEND_INI_BOOLEAN("fatal_error_backtraces", "1", ZEND_INI_ALL, OnUpdateBool, fatal_error_backtraces, zend_compiler_globals, executor_globals)
271264
STD_ZEND_INI_ENTRY("zend.assertions", "1", ZEND_INI_ALL, OnUpdateAssertions, assertions, zend_executor_globals, executor_globals)
272265
ZEND_INI_ENTRY3_EX("zend.enable_gc", "1", ZEND_INI_ALL, OnUpdateGCEnabled, NULL, NULL, NULL, zend_gc_enabled_displayer_cb)
273266
STD_ZEND_INI_BOOLEAN("zend.multibyte", "0", ZEND_INI_PERDIR, OnUpdateBool, multibyte, zend_compiler_globals, compiler_globals)
@@ -1475,6 +1468,7 @@ ZEND_API ZEND_COLD void zend_error_zstr_at(
14751468

14761469
// Always clear the last backtrace.
14771470
zval_ptr_dtor(&EG(error_backtrace));
1471+
ZVAL_UNDEF(&EG(error_backtrace));
14781472

14791473
/* Report about uncaught exception in case of fatal errors */
14801474
if (EG(exception)) {

Zend/zend_globals.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ struct _zend_executor_globals {
181181

182182
JMP_BUF *bailout;
183183

184-
int error_reporting;
184+
int error_reporting;
185185

186186
int fatal_error_backtraces;
187187
zval error_backtrace;

0 commit comments

Comments
 (0)