Skip to content

Commit 3dfa258

Browse files
committed
Don't use ternary in ini default
We use sizeof() on ini defaults, so this isn't safe. I can't reproduce the failures locally, but I expect this to fix the asan jobs.
1 parent 4c899fb commit 3dfa258

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

Zend/zend.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,12 @@ static ZEND_INI_MH(OnUpdateAssertions) /* {{{ */
165165
}
166166
/* }}} */
167167

168+
#if ZEND_DEBUG
169+
# define SIGNAL_CHECK_DEFAULT "1"
170+
#else
171+
# define SIGNAL_CHECK_DEFAULT "0"
172+
#endif
173+
168174
ZEND_INI_BEGIN()
169175
ZEND_INI_ENTRY("error_reporting", NULL, ZEND_INI_ALL, OnUpdateErrorReporting)
170176
STD_ZEND_INI_ENTRY("zend.assertions", "1", ZEND_INI_ALL, OnUpdateAssertions, assertions, zend_executor_globals, executor_globals)
@@ -173,7 +179,7 @@ ZEND_INI_BEGIN()
173179
ZEND_INI_ENTRY("zend.script_encoding", NULL, ZEND_INI_ALL, OnUpdateScriptEncoding)
174180
STD_ZEND_INI_BOOLEAN("zend.detect_unicode", "1", ZEND_INI_ALL, OnUpdateBool, detect_unicode, zend_compiler_globals, compiler_globals)
175181
#ifdef ZEND_SIGNALS
176-
STD_ZEND_INI_BOOLEAN("zend.signal_check", ZEND_DEBUG ? "1" : "0", ZEND_INI_SYSTEM, OnUpdateBool, check, zend_signal_globals_t, zend_signal_globals)
182+
STD_ZEND_INI_BOOLEAN("zend.signal_check", SIGNAL_CHECK_DEFAULT, ZEND_INI_SYSTEM, OnUpdateBool, check, zend_signal_globals_t, zend_signal_globals)
177183
#endif
178184
STD_ZEND_INI_BOOLEAN("zend.exception_ignore_args", "0", ZEND_INI_ALL, OnUpdateBool, exception_ignore_args, zend_executor_globals, executor_globals)
179185
ZEND_INI_END()

0 commit comments

Comments
 (0)