diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-09-07 14:02:03 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-09-07 14:02:03 +0200 |
| commit | cfdd828163bc03b63e41d92adc5b127f567e4c46 (patch) | |
| tree | 6f52cb225dbb2c8b0eb29cd7a7340e68118d81f8 | |
| parent | b323e1e8d07f655756b4ecb23e45cc424c0a9937 (diff) | |
| download | php-git-cfdd828163bc03b63e41d92adc5b127f567e4c46.tar.gz | |
Fixed bug #76796
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/opcache/Optimizer/sccp.c | 3 | ||||
| -rw-r--r-- | ext/opcache/tests/bug76796.phpt | 16 |
3 files changed, 20 insertions, 1 deletions
@@ -5,6 +5,8 @@ PHP NEWS - Opcache: . Fixed bug #76832 (ZendOPcache.MemoryBase periodically deleted by the OS). (Anatol) + . Fixed bug #76796 (Compile-time evaluation of disabled function in opcache + causes segfault). (Nikita) - POSIX: . Fixed bug #75696 (posix_getgrnam fails to print details of group). (cmb) diff --git a/ext/opcache/Optimizer/sccp.c b/ext/opcache/Optimizer/sccp.c index e6d40d865d..6a7765aa62 100644 --- a/ext/opcache/Optimizer/sccp.c +++ b/ext/opcache/Optimizer/sccp.c @@ -833,7 +833,8 @@ static inline int ct_eval_func_call( } func = zend_hash_find_ptr(CG(function_table), name); - if (!func || func->type != ZEND_INTERNAL_FUNCTION) { + if (!func || func->type != ZEND_INTERNAL_FUNCTION + || func->internal_function.handler == ZEND_FN(display_disabled_function)) { return FAILURE; } diff --git a/ext/opcache/tests/bug76796.phpt b/ext/opcache/tests/bug76796.phpt new file mode 100644 index 0000000000..8388484e10 --- /dev/null +++ b/ext/opcache/tests/bug76796.phpt @@ -0,0 +1,16 @@ +--TEST-- +Bug #76796: Compile-time evaluation of disabled function in opcache (SCCP) causes segfault +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.optimization_level=-1 +disable_functions=strpos +--FILE-- +<?php + +var_dump(strpos('foo', 'bar')); + +?> +--EXPECTF-- +Warning: strpos() has been disabled for security reasons in %s on line %d +NULL |