From: Joe Watkins <krakjoe@php.net>
Date: Mon, 3 Jun 2019 09:20:12 +0000 (+0200)
Subject: Revert "Fix bug #62397 - disable_functions does not work with eval."
X-Git-Tag: php-7.4.0alpha1~112
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff96f25b12287de8105305b6f92c7714833066a7;p=php

Revert "Fix bug #62397 - disable_functions does not work with eval."

This reverts commit 050d299364ded5cb7b878bc515aa763c9c623c4b.
---

diff --git a/Zend/tests/errmsg_046.phpt b/Zend/tests/errmsg_046.phpt
deleted file mode 100644
index 0a4ec50183..0000000000
--- a/Zend/tests/errmsg_046.phpt
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-errmsg: disabled eval function
---INI--
-disable_functions=eval
---FILE--
-<?php
-
-eval('echo "Eval";');
-
-echo "Done\n";
-?>
---EXPECTF--
-Warning: eval() has been disabled for security reasons in %s on line %d
-Done
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 01ce2e5517..10b47a1919 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -2757,12 +2757,6 @@ ZEND_API int zend_set_hash_symbol(zval *symbol, const char *name, int name_lengt
 
 /* Disabled functions support */
 
-static ZEND_COLD zend_op_array *display_disabled_compile_string(zval *source_string, char *filename)
-{
-	zend_error(E_WARNING, "eval() has been disabled for security reasons");
-	return NULL;
-}
-
 /* {{{ proto void display_disabled_function(void)
 Dummy function which displays an error when a disabled function is called. */
 ZEND_API ZEND_COLD ZEND_FUNCTION(display_disabled_function)
@@ -2774,12 +2768,6 @@ ZEND_API ZEND_COLD ZEND_FUNCTION(display_disabled_function)
 ZEND_API int zend_disable_function(char *function_name, size_t function_name_length) /* {{{ */
 {
 	zend_internal_function *func;
-
-	if (strcmp(function_name, "eval") == 0) {
-		zend_compile_string = display_disabled_compile_string;
-		return SUCCESS;
-	}
-
 	if ((func = zend_hash_str_find_ptr(CG(function_table), function_name, function_name_length))) {
 	    func->fn_flags &= ~(ZEND_ACC_VARIADIC | ZEND_ACC_HAS_TYPE_HINTS | ZEND_ACC_HAS_RETURN_TYPE);
 		func->num_args = 0;