php · Girgias · Jun 13, 2024 · Jun 13, 2024
@@ -2881,7 +2881,7 @@ ZEND_API char* ZEND_FASTCALL zend_strndup(const char *s, size_t length)
 	return p;
 }
 
-ZEND_API zend_result zend_set_memory_limit(size_t memory_limit)
+ZEND_API bool zend_set_memory_limit(size_t memory_limit)
 {
 #if ZEND_MM_LIMIT
 	zend_mm_heap *heap = AG(mm_heap);
@@ -2896,13 +2896,13 @@ ZEND_API zend_result zend_set_memory_limit(size_t memory_limit)
 				heap->cached_chunks_count--;
 				heap->real_size -= ZEND_MM_CHUNK_SIZE;
 			} while (memory_limit < heap->real_size);
-			return SUCCESS;
+			return true;
 		}
-		return FAILURE;
+		return false;
 	}
 	AG(mm_heap)->limit = memory_limit;
 #endif
-	return SUCCESS;
+	return true;
 }
 
 ZEND_API bool zend_alloc_in_memory_limit_error_reporting(void)

@@ -21,9 +21,7 @@
 #ifndef ZEND_ALLOC_H
 #define ZEND_ALLOC_H
 
-#include <stdio.h>
-
-#include "zend_types.h"
+#include "zend_portability.h"
 #include "../TSRM/TSRM.h"
 
 #ifndef ZEND_MM_ALIGNMENT
@@ -215,7 +213,7 @@ ZEND_API ZEND_ATTRIBUTE_MALLOC char * __zend_strdup(const char *s);
 #define perealloc2_recoverable_rel(ptr, size, copy_size, persistent) ((persistent)?realloc((ptr), (size)):erealloc2_recoverable_rel((ptr), (size), (copy_size)))
 #define pestrdup_rel(s, persistent) ((persistent)?strdup(s):estrdup_rel(s))
 
-ZEND_API zend_result zend_set_memory_limit(size_t memory_limit);
+ZEND_API bool zend_set_memory_limit(size_t memory_limit);
 ZEND_API bool zend_alloc_in_memory_limit_error_reporting(void);
 
 ZEND_API void start_memory_manager(void);

diff --git a/Zend/zend_arena.h b/Zend/zend_arena.h
@@ -19,7 +19,7 @@
 #ifndef _ZEND_ARENA_H_
 #define _ZEND_ARENA_H_
 
-#include "zend.h"
+#include "zend_alloc.h"
 
 #ifndef ZEND_TRACK_ARENA_ALLOC
 

@@ -19,8 +19,6 @@
 #ifndef ZEND_CALL_STACK_H
 #define ZEND_CALL_STACK_H
 
-#include "zend.h"
-#include "zend_portability.h"
 #ifdef __APPLE__
 # include <pthread.h>
 #endif

diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
@@ -34,14 +34,15 @@
 #include "zend_llist.h"
 #include "zend_objects.h"
 #include "zend_objects_API.h"
-#include "zend_modules.h"
 #include "zend_float.h"
 #include "zend_multibyte.h"
 #include "zend_multiply.h"
 #include "zend_arena.h"
 #include "zend_call_stack.h"
 #include "zend_max_execution_timer.h"
 #include "zend_strtod.h"
+#include "zend_compile.h"
+#include "zend_ini.h"
 
 /* Define ZTS if you want a thread-safe Zend */
 /*#undef ZTS*/
@@ -64,13 +65,10 @@ END_EXTERN_C()
 # define ZEND_MAX_ALLOWED_STACK_SIZE_DETECT     0
 #endif
 
-#include "zend_compile.h"
-
 /* excpt.h on Digital Unix 4.0 defines function_table */
 #undef function_table
 
 typedef struct _zend_vm_stack *zend_vm_stack;
-typedef struct _zend_ini_entry zend_ini_entry;
 typedef struct _zend_fiber_context zend_fiber_context;
 typedef struct _zend_fiber zend_fiber;
 

diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
@@ -17,10 +17,10 @@
 */
 
 #include "zend.h"
-#include "zend_sort.h"
-#include "zend_API.h"
 #include "zend_ini.h"
 #include "zend_alloc.h"
+#include "zend_globals.h"
+#include "zend_globals_macros.h"
 #include "zend_operators.h"
 #include "zend_strtod.h"
 #include "zend_modules.h"

diff --git a/Zend/zend_ini.h b/Zend/zend_ini.h
@@ -19,7 +19,9 @@
 #ifndef ZEND_INI_H
 #define ZEND_INI_H
 
-#include "zend_modules.h"
+#include "zend_portability.h"
+#include "zend_types.h"
+#include "zend_stream.h"
 
 #define ZEND_INI_USER	(1<<0)
 #define ZEND_INI_PERDIR	(1<<1)
@@ -30,6 +32,9 @@
 #define ZEND_INI_MH(name) int name(zend_ini_entry *entry, zend_string *new_value, void *mh_arg1, void *mh_arg2, void *mh_arg3, int stage)
 #define ZEND_INI_DISP(name) ZEND_COLD void name(zend_ini_entry *ini_entry, int type)
 
+typedef struct _zend_module_entry zend_module_entry;
+typedef struct _zend_ini_entry zend_ini_entry;
+
 typedef struct _zend_ini_entry_def {
 	const char *name;
 	ZEND_INI_MH((*on_modify));

diff --git a/Zend/zend_list.c b/Zend/zend_list.c
@@ -19,10 +19,9 @@
 
 /* resource lists */
 
-#include "zend.h"
 #include "zend_list.h"
+#include "zend.h"
 #include "zend_API.h"
-#include "zend_globals.h"
 
 ZEND_API int le_index_ptr;
 

diff --git a/Zend/zend_list.h b/Zend/zend_list.h
@@ -20,8 +20,8 @@
 #ifndef ZEND_LIST_H
 #define ZEND_LIST_H
 
-#include "zend_hash.h"
-#include "zend_globals.h"
+#include "zend_portability.h"
+#include "zend_types.h"
 
 BEGIN_EXTERN_C()
 

diff --git a/Zend/zend_llist.c b/Zend/zend_llist.c
@@ -17,9 +17,10 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend.h"
 #include "zend_llist.h"
+#include "zend_alloc.h"
 #include "zend_sort.h"
+#include <string.h>
 
 ZEND_API void zend_llist_init(zend_llist *l, size_t size, llist_dtor_func_t dtor, unsigned char persistent)
 {

diff --git a/Zend/zend_llist.h b/Zend/zend_llist.h
@@ -20,6 +20,8 @@
 #ifndef ZEND_LLIST_H
 #define ZEND_LLIST_H
 
+#include <stdarg.h>
+#include <stddef.h>
 #include "zend_portability.h"
 
 typedef struct _zend_llist_element {

diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h
@@ -20,9 +20,10 @@
 #ifndef MODULES_H
 #define MODULES_H
 
-#include "zend.h"
-#include "zend_compile.h"
+#include "zend_portability.h"
+#include "zend_types.h"
 #include "zend_build.h"
+#include "zend_ini.h"
 
 #define INIT_FUNC_ARGS		int type, int module_number
 #define INIT_FUNC_ARGS_PASSTHRU	type, module_number
@@ -64,7 +65,6 @@
 #define MODULE_PERSISTENT 1
 #define MODULE_TEMPORARY 2
 
-struct _zend_ini_entry;
 typedef struct _zend_module_entry zend_module_entry;
 typedef struct _zend_module_dep zend_module_dep;
 

diff --git a/Zend/zend_multiply.h b/Zend/zend_multiply.h
@@ -18,6 +18,7 @@
 */
 
 #include "zend_portability.h"
+#include "zend.h" /* For zend_error_noreturn() */
 
 #ifndef ZEND_MULTIPLY_H
 #define ZEND_MULTIPLY_H

diff --git a/Zend/zend_observer.h b/Zend/zend_observer.h
@@ -20,8 +20,8 @@
 #ifndef ZEND_OBSERVER_H
 #define ZEND_OBSERVER_H
 
-#include "zend.h"
-#include "zend_compile.h"
+#include "zend_portability.h" /* For ZEND_FASTCALL */
+#include "zend_types.h"
 #include "zend_fibers.h"
 
 BEGIN_EXTERN_C()

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
@@ -20,7 +20,6 @@
 
 #include <ctype.h>
 
-#include "zend.h"
 #include "zend_operators.h"
 #include "zend_variables.h"
 #include "zend_globals.h"

diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
@@ -32,8 +32,8 @@
 #endif
 
 #include "zend_portability.h"
-#include "zend_strtod.h"
-#include "zend_multiply.h"
+#include "zend_hash.h"
+#include "zend_string.h"
 #include "zend_object_handlers.h"
 
 #define LONG_SIGN_MASK ZEND_LONG_MIN

diff --git a/Zend/zend_ptr_stack.c b/Zend/zend_ptr_stack.c
@@ -17,8 +17,8 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend.h"
 #include "zend_ptr_stack.h"
+#include "zend_alloc.h"
 #include <stdarg.h>
 
 ZEND_API void zend_ptr_stack_init_ex(zend_ptr_stack *stack, bool persistent)

diff --git a/Zend/zend_ptr_stack.h b/Zend/zend_ptr_stack.h
@@ -20,6 +20,7 @@
 #ifndef ZEND_PTR_STACK_H
 #define ZEND_PTR_STACK_H
 
+#include "zend_portability.h"
 #include "zend_alloc.h"
 
 typedef struct _zend_ptr_stack {

diff --git a/Zend/zend_smart_str.c b/Zend/zend_smart_str.c
@@ -14,7 +14,6 @@
    +----------------------------------------------------------------------+
  */
 
-#include <zend.h>
 #include "zend_smart_str.h"
 #include "zend_smart_string.h"
 #include "zend_enum.h"

diff --git a/Zend/zend_smart_str.h b/Zend/zend_smart_str.h
@@ -17,9 +17,11 @@
 #ifndef ZEND_SMART_STR_H
 #define ZEND_SMART_STR_H
 
-#include <zend.h>
-#include "zend_globals.h"
 #include "zend_smart_str_public.h"
+#include "zend_portability.h"
+#include "zend_long.h"
+#include "zend_string.h"
+#include "zend_operators.h"
 
 BEGIN_EXTERN_C()
 

diff --git a/Zend/zend_smart_string.h b/Zend/zend_smart_string.h
@@ -21,7 +21,8 @@
 #include "zend_smart_string_public.h"
 
 #include <stdlib.h>
-#include <zend.h>
+#include "zend_portability.h"
+#include "zend_long.h"
 
 /* wrapper */
 

diff --git a/Zend/zend_smart_string_public.h b/Zend/zend_smart_string_public.h
@@ -18,7 +18,7 @@
 #ifndef PHP_SMART_STRING_PUBLIC_H
 #define PHP_SMART_STRING_PUBLIC_H
 
-#include <sys/types.h>
+#include <stddef.h>
 
 typedef struct {
 	char *c;

diff --git a/Zend/zend_sort.c b/Zend/zend_sort.c
@@ -17,9 +17,10 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend.h"
 #include "zend_sort.h"
-#include <limits.h>
+#include "zend_long.h"
+#include "zend_portability.h"
+#include <stddef.h>
 
 static inline void zend_sort_2(void *a, void *b, compare_func_t cmp, swap_func_t swp) /* {{{ */ {
 	if (cmp(a, b) > 0) {

diff --git a/Zend/zend_sort.h b/Zend/zend_sort.h
@@ -20,6 +20,7 @@
 #ifndef ZEND_SORT_H
 #define ZEND_SORT_H
 
+#include "zend_portability.h"
 #include "zend_types.h"
 
 BEGIN_EXTERN_C()

diff --git a/Zend/zend_strtod.h b/Zend/zend_strtod.h
@@ -20,7 +20,8 @@
  * can be found in zend_strtod.c */
 #ifndef ZEND_STRTOD_H
 #define ZEND_STRTOD_H
-#include <zend.h>
+
+#include "zend_portability.h"
 
 BEGIN_EXTERN_C()
 #define ZEND_STRTOD_K_MAX 7

@@ -30,6 +30,7 @@
 
 #include "mbfilter.h"
 #include "mbfilter_base64.h"
+#include "zend_multiply.h" /* For zend_safe_address_guarded() */
 
 static size_t mb_base64_to_wchar(unsigned char **in, size_t *in_len, uint32_t *buf, size_t bufsize, unsigned int *state);
 static void mb_wchar_to_base64(uint32_t *in, size_t len, mb_convert_buf *buf, bool end);

@@ -26,6 +26,7 @@
 # include <config.h>
 #endif
 
+
 #define ACCELERATOR_PRODUCT_NAME	"Zend OPcache"
 /* 2 - added Profiler support, on 20010712 */
 /* 3 - added support for Optimizer's encoded-only-files mode */
@@ -48,6 +49,8 @@
 # include "unistd.h"
 #endif
 
+#include "zend_types.h"
+#include "zend_modules.h"
 #include "zend_extensions.h"
 #include "zend_compile.h"
 
@@ -311,7 +314,7 @@ extern const char *zps_api_failure_reason;
 BEGIN_EXTERN_C()
 
 void accel_shutdown(void);
-zend_result  accel_activate(INIT_FUNC_ARGS);
+zend_result accel_activate(INIT_FUNC_ARGS);
 zend_result accel_post_deactivate(void);
 void zend_accel_schedule_restart(zend_accel_restart_reason reason);
 void zend_accel_schedule_restart_if_necessary(zend_accel_restart_reason reason);

@@ -280,7 +280,7 @@ static PHP_INI_MH(OnChangeMemoryLimit)
 	} else {
 		value = Z_L(1)<<30;		/* effectively, no limit */
 	}
-	if (zend_set_memory_limit(value) == FAILURE) {
+	if (!zend_set_memory_limit(value)) {
 		/* When the memory limit is reset to the original level during deactivation, we may be
 		 * using more memory than the original limit while shutdown is still in progress.
 		 * Ignore a failure for now, and set the memory limit when the memory manager has been