From: Joe Watkins <krakjoe@php.net>
Date: Wed, 4 May 2016 09:53:59 +0000 (+0100)
Subject: add compiler option to disable builtins (special case function calls)
X-Git-Tag: php-7.0.7RC1~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9bbee305e3bb1d85ddad6bad92409818953207d5;p=php

add compiler option to disable builtins (special case function calls)
---

diff --git a/NEWS b/NEWS
index 01c9c24601..474445dd73 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ PHP                                                                        NEWS
 ?? ??? 2016 PHP 7.0.7
 
 - Core:
+  . Add compiler option to disable special case function calls. (Joe)
   . Fixed bug #72101 (crash on complex code). (Dmitry)
   . Fixed bug #72100 (implode() inserts garbage into resulting string when
     joins very big integer). (Mikhail Galanin)
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index c79f1d75f6..6b78bd8bd5 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3169,6 +3169,14 @@ int zend_try_compile_special_func(znode *result, zend_string *lcname, zend_ast_l
 		return FAILURE;
 	}
 
+	if (zend_string_equals_literal(lcname, "assert")) {
+		return zend_compile_assert(result, args, lcname, fbc);
+	}
+
+	if (CG(compiler_options) & ZEND_COMPILE_NO_BUILTINS) {
+		return FAILURE;
+	}
+
 	if (zend_string_equals_literal(lcname, "strlen")) {
 		return zend_compile_func_strlen(result, args);
 	} else if (zend_string_equals_literal(lcname, "is_null")) {
@@ -3199,8 +3207,6 @@ int zend_try_compile_special_func(znode *result, zend_string *lcname, zend_ast_l
 		return zend_compile_func_cufa(result, args, lcname);
 	} else if (zend_string_equals_literal(lcname, "call_user_func")) {
 		return zend_compile_func_cuf(result, args, lcname);
-	} else if (zend_string_equals_literal(lcname, "assert")) {
-		return zend_compile_assert(result, args, lcname, fbc);
 	} else {
 		return FAILURE;
 	}
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 9e30f55bdc..bbd2df7f2e 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -1011,6 +1011,9 @@ END_EXTERN_C()
 /* force IS_OBJ_USE_GUARDS for all classes */
 #define ZEND_COMPILE_GUARDS						(1<<9)
 
+/* disable builtin special case function calls */
+#define ZEND_COMPILE_NO_BUILTINS				(1<<10)
+
 /* The default value for CG(compiler_options) */
 #define ZEND_COMPILE_DEFAULT					ZEND_COMPILE_HANDLE_OP_ARRAY