Change ini settings modifiability to INI_SYSTEM

Author: arnaud-lb

Zend/zend.c

@@ -179,9 +179,9 @@ static ZEND_INI_MH(OnUpdateMaxAllowedStackSize) /* {{{ */
 {
 	zend_long size = zend_ini_parse_quantity_warn(new_value, entry->name);
 
-	if (size < ZEND_MAX_ALLOWED_STACK_USAGE_UNCHECKED) {
+	if (size < ZEND_MAX_ALLOWED_STACK_SIZE_UNCHECKED) {
 		zend_error(E_WARNING, "Invalid \"%s\" setting. Value must be >= %d, but got " ZEND_LONG_FMT,
-			ZSTR_VAL(entry->name), ZEND_MAX_ALLOWED_STACK_USAGE_UNCHECKED, size);
+			ZSTR_VAL(entry->name), ZEND_MAX_ALLOWED_STACK_SIZE_UNCHECKED, size);
 		return FAILURE;
 	}
 
@@ -252,9 +252,9 @@ ZEND_INI_BEGIN()
 	STD_ZEND_INI_ENTRY("fiber.stack_size",		NULL,			ZEND_INI_ALL,		OnUpdateFiberStackSize,		fiber_stack_size,	zend_executor_globals, 		executor_globals)
 #ifdef ZEND_CHECK_STACK_LIMIT
 	/* The maximum allowed call stack size. 0: auto detect, -1: no limit. For fibers, this is fiber.stack_size. */
-	STD_ZEND_INI_ENTRY("zend.max_allowed_stack_size",	"0",	ZEND_INI_PERDIR,	OnUpdateMaxAllowedStackSize,	max_allowed_stack_size,		zend_executor_globals,	executor_globals)
+	STD_ZEND_INI_ENTRY("zend.max_allowed_stack_size",	"0",	ZEND_INI_SYSTEM,	OnUpdateMaxAllowedStackSize,	max_allowed_stack_size,		zend_executor_globals,	executor_globals)
 	/* Substracted from the max allowed stack size, as a buffer, when checking for overflow. 0: auto detect. */
-	STD_ZEND_INI_ENTRY("zend.reserved_stack_size",	"0",	ZEND_INI_PERDIR,	OnUpdateReservedStackSize,	reserved_stack_size,		zend_executor_globals,	executor_globals)
+	STD_ZEND_INI_ENTRY("zend.reserved_stack_size",	"0",	ZEND_INI_SYSTEM,	OnUpdateReservedStackSize,	reserved_stack_size,		zend_executor_globals,	executor_globals)
 #endif
 
 ZEND_INI_END()
@@ -851,10 +851,8 @@ static void executor_globals_ctor(zend_executor_globals *executor_globals) /* {{
 	executor_globals->errors = NULL;
 
 # ifdef ZEND_CHECK_STACK_LIMIT
-	if (!zend_call_stack_get(&executor_globals->call_stack)) {
-		executor_globals->call_stack = (zend_call_stack){0};
-	}
-# endif /* ZEND_CHECK_STACK_LIMIT */
+	zend_call_stack_init();
+# endif
 }
 /* }}} */
 
@@ -1041,12 +1039,6 @@ void zend_startup(zend_utility_functions *utility_functions) /* {{{ */
 	CG(map_ptr_base) = ZEND_MAP_PTR_BIASED_BASE(NULL);
 	CG(map_ptr_size) = 0;
 	CG(map_ptr_last) = 0;
-
-# ifdef ZEND_CHECK_STACK_LIMIT
-	if (!zend_call_stack_get(&EG(call_stack))) {
-		EG(call_stack) = (zend_call_stack){0};
-	}
-# endif /* ZEND_CHECK_STACK_LIMIT */
 #endif /* ZTS */
 	EG(error_reporting) = E_ALL & ~E_NOTICE;
 
@@ -1140,6 +1132,9 @@ zend_result zend_post_startup(void) /* {{{ */
 	zend_copy_ini_directives();
 #else
 	global_map_ptr_last = CG(map_ptr_last);
+# ifdef ZEND_CHECK_STACK_LIMIT
+	zend_call_stack_init();
+# endif
 #endif
 
 	return SUCCESS;

Zend/zend_call_stack.c

@@ -19,6 +19,7 @@
 /* Inspired from Chromium's stack_util.cc */
 
 #include "zend.h"
+#include "zend_globals.h"
 #include "zend_portability.h"
 #include "zend_call_stack.h"
 #include <stdint.h>
@@ -47,6 +48,43 @@
 #include <sys/syscall.h>
 #endif
 
+/* Called once per process or thread */
+ZEND_API void zend_call_stack_init(void) {
+	if (!zend_call_stack_get(&EG(call_stack))) {
+		EG(call_stack) = (zend_call_stack){0};
+	}
+
+	switch (EG(max_allowed_stack_size)) {
+		case ZEND_MAX_ALLOWED_STACK_SIZE_DETECT: {
+			void *base = EG(call_stack).base;
+			size_t size = EG(call_stack).max_size;
+			if (UNEXPECTED(base == (void*)0)) {
+				base = zend_call_stack_position();
+				size = zend_call_stack_default_size();
+				/* base is not the actual stack base */
+				size -= 32 * 1024;
+			}
+			EG(stack_base) = base;
+			EG(stack_limit) = zend_call_stack_limit(base, size, EG(reserved_stack_size));
+			break;
+	    }
+		case ZEND_MAX_ALLOWED_STACK_SIZE_UNCHECKED: {
+			EG(stack_base) = (void*)0;
+			EG(stack_limit) = (void*)0;
+			break;
+	    }
+		default: {
+			ZEND_ASSERT(EG(max_allowed_stack_size) > 0);
+			void *base = EG(call_stack).base;
+			if (UNEXPECTED(base == (void*)0)) {
+				base = zend_call_stack_position();
+			}
+			EG(stack_base) = base;
+			EG(stack_limit) = zend_call_stack_limit(base, EG(max_allowed_stack_size), EG(reserved_stack_size));
+			break;
+	    }
+	}
+}
 
 #ifdef __linux__
 static bool zend_call_stack_is_main_thread(void) {

Zend/zend_call_stack.h

@@ -30,6 +30,8 @@ typedef struct _zend_call_stack {
 	size_t max_size;
 } zend_call_stack;
 
+ZEND_API void zend_call_stack_init(void);
+
 ZEND_API bool zend_call_stack_get(zend_call_stack *stack);
 
 /** Returns an approximation of the current stack position */

Zend/zend_execute_API.c

@@ -172,32 +172,6 @@ void init_executor(void) /* {{{ */
 	ZEND_ATOMIC_BOOL_INIT(&EG(vm_interrupt), false);
 	ZEND_ATOMIC_BOOL_INIT(&EG(timed_out), false);
 
-#ifdef ZEND_CHECK_STACK_LIMIT
-	if (EXPECTED(EG(max_allowed_stack_size) == ZEND_MAX_ALLOWED_STACK_USAGE_DETECT)) {
-		void *base = EG(call_stack).base;
-		size_t size = EG(call_stack).max_size;
-		if (UNEXPECTED(base == (void*)0)) {
-			base = zend_call_stack_position();
-			size = zend_call_stack_default_size();
-			/* base is not the actual stack base */
-			size -= 32 * 1024;
-		}
-		EG(stack_base) = base;
-		EG(stack_limit) = zend_call_stack_limit(base, size, EG(reserved_stack_size));
-	} else if (EG(max_allowed_stack_size) == ZEND_MAX_ALLOWED_STACK_USAGE_UNCHECKED) {
-		EG(stack_base) = (void*)0;
-		EG(stack_limit) = (void*)0;
-	} else {
-		ZEND_ASSERT(EG(max_allowed_stack_size) > 0);
-		void *base = EG(call_stack).base;
-		if (UNEXPECTED(base == (void*)0)) {
-			base = zend_call_stack_position();
-		}
-		EG(stack_base) = base;
-		EG(stack_limit) = zend_call_stack_limit(base, EG(max_allowed_stack_size), EG(reserved_stack_size));
-	}
-#endif /* ZEND_CHECK_STACK_LIMIT */
-
 	EG(exception) = NULL;
 	EG(prev_exception) = NULL;
 

Zend/zend_globals.h

@@ -56,8 +56,8 @@ END_EXTERN_C()
 #define SYMTABLE_CACHE_SIZE 32
 
 #ifdef ZEND_CHECK_STACK_LIMIT
-# define ZEND_MAX_ALLOWED_STACK_USAGE_UNCHECKED -1
-# define ZEND_MAX_ALLOWED_STACK_USAGE_DETECT     0
+# define ZEND_MAX_ALLOWED_STACK_SIZE_UNCHECKED -1
+# define ZEND_MAX_ALLOWED_STACK_SIZE_DETECT     0
 #endif
 
 #include "zend_compile.h"