From 8e9310e9bc53b400b51aac61de9ede5d66176b15 Mon Sep 17 00:00:00 2001 From: Marc Bennewitz Date: Sat, 26 Jul 2025 10:59:47 +0200 Subject: [PATCH] Deprecate ZEND_SIZE_MAX and point to SIZE_MAX directly --- Zend/zend_types.h | 15 ++------------- ext/standard/formatted_print.c | 2 +- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/Zend/zend_types.h b/Zend/zend_types.h index a3d3e4da6362d..43aa2aa86a00e 100644 --- a/Zend/zend_types.h +++ b/Zend/zend_types.h @@ -62,19 +62,8 @@ typedef enum { typedef ZEND_RESULT_CODE zend_result; -#ifdef ZEND_ENABLE_ZVAL_LONG64 -# ifdef ZEND_WIN32 -# define ZEND_SIZE_MAX _UI64_MAX -# else -# define ZEND_SIZE_MAX SIZE_MAX -# endif -#else -# if defined(ZEND_WIN32) -# define ZEND_SIZE_MAX _UI32_MAX -# else -# define ZEND_SIZE_MAX SIZE_MAX -# endif -#endif +/* This constant is deprecated, use SIZE_MAX instead */ +#define ZEND_SIZE_MAX SIZE_MAX #ifdef ZTS #define ZEND_TLS static TSRM_TLS diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c index b2c287c02900c..9a72b8267f46d 100644 --- a/ext/standard/formatted_print.c +++ b/ext/standard/formatted_print.c @@ -103,7 +103,7 @@ php_sprintf_appendstring(zend_string **buffer, size_t *pos, char *add, if (req_size > ZSTR_LEN(*buffer)) { size_t size = ZSTR_LEN(*buffer); while (req_size > size) { - if (size > ZEND_SIZE_MAX/2) { + if (size > SIZE_MAX/2) { zend_error_noreturn(E_ERROR, "Field width %zd is too long", req_size); } size <<= 1;