php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 17:22:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.6'

Browse Source 
Conflicts:
	Zend/zend_API.c
This commit is contained in:
Xinchen Hui
2014-10-31 17:37:56 +08:00
parent 84783ecb7e d017c4bf3a
commit ccb09eb352
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Zend/zend_API.c
View File

@@ -2754,21 +2754,15 @@ ZEND_API ZEND_FUNCTION(display_disabled_function)
}
/* }}} */
static zend_function_entry disabled_function[] = {
ZEND_FE(display_disabled_function, NULL)
ZEND_FE_END
};
ZEND_API int zend_disable_function(char *function_name, size_t function_name_length TSRMLS_DC) /* {{{ */
{
int ret;
ret = zend_hash_str_del(CG(function_table), function_name, function_name_length);
if (ret == FAILURE) {
return FAILURE;
zend_internal_function *func;
if ((func = zend_hash_str_find_ptr(CG(function_table), function_name, function_name_length))) {
func->arg_info = NULL;
func->handler = ZEND_FN(display_disabled_function);
return SUCCESS;
}
disabled_function[0].fname = function_name;
return zend_register_functions(NULL, disabled_function, CG(function_table), MODULE_PERSISTENT TSRMLS_CC);
return FAILURE;
}
/* }}} */

17
ext/opcache/tests/bug68104.phpt Normal file
View File

@@ -0,0 +1,17 @@
--TEST--
Bug #68104 (Segfault while pre-evaluating a disabled function)
--INI--
opcache.enable=1
opcache.enable_cli=1
disable_functions=dl
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--FILE--
<?php
var_dump(is_callable("dl"));
dl("a.so");
?>
--EXPECTF--
bool(true)
Warning: dl() has been disabled for security reasons in %sbug68104.php on line %d