From 6b160e78a7212b8c3e4c1ff75ce02420228e1b6c Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Thu, 28 Jul 2022 21:03:09 +0100 Subject: [PATCH] Change fetch_type from int to uint32_t (#9152) This is because it is derived from the opcode num which is an uint32_t --- Zend/zend_execute.h | 6 +++--- Zend/zend_execute_API.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index ee9ed003550..b43f038e492 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -349,9 +349,9 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_cannot_pass_by_reference(uint32_t arg ZEND_API void zend_set_timeout(zend_long seconds, bool reset_signals); ZEND_API void zend_unset_timeout(void); ZEND_API ZEND_NORETURN void ZEND_FASTCALL zend_timeout(void); -ZEND_API zend_class_entry *zend_fetch_class(zend_string *class_name, int fetch_type); -ZEND_API zend_class_entry *zend_fetch_class_with_scope(zend_string *class_name, int fetch_type, zend_class_entry *scope); -ZEND_API zend_class_entry *zend_fetch_class_by_name(zend_string *class_name, zend_string *lcname, int fetch_type); +ZEND_API zend_class_entry *zend_fetch_class(zend_string *class_name, uint32_t fetch_type); +ZEND_API zend_class_entry *zend_fetch_class_with_scope(zend_string *class_name, uint32_t fetch_type, zend_class_entry *scope); +ZEND_API zend_class_entry *zend_fetch_class_by_name(zend_string *class_name, zend_string *lcname, uint32_t fetch_type); ZEND_API zend_function * ZEND_FASTCALL zend_fetch_function(zend_string *name); ZEND_API zend_function * ZEND_FASTCALL zend_fetch_function_str(const char *name, size_t len); diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 1ac9712938d..755bc2cd2c9 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -1534,7 +1534,7 @@ void zend_unset_timeout(void) /* {{{ */ } /* }}} */ -static ZEND_COLD void report_class_fetch_error(zend_string *class_name, int fetch_type) +static ZEND_COLD void report_class_fetch_error(zend_string *class_name, uint32_t fetch_type) { if (fetch_type & ZEND_FETCH_CLASS_SILENT) { return; @@ -1556,10 +1556,10 @@ static ZEND_COLD void report_class_fetch_error(zend_string *class_name, int fetc } } -zend_class_entry *zend_fetch_class(zend_string *class_name, int fetch_type) /* {{{ */ +zend_class_entry *zend_fetch_class(zend_string *class_name, uint32_t fetch_type) /* {{{ */ { zend_class_entry *ce, *scope; - int fetch_sub_type = fetch_type & ZEND_FETCH_CLASS_MASK; + uint32_t fetch_sub_type = fetch_type & ZEND_FETCH_CLASS_MASK; check_fetch_type: switch (fetch_sub_type) { @@ -1605,7 +1605,7 @@ check_fetch_type: /* }}} */ zend_class_entry *zend_fetch_class_with_scope( - zend_string *class_name, int fetch_type, zend_class_entry *scope) + zend_string *class_name, uint32_t fetch_type, zend_class_entry *scope) { zend_class_entry *ce; switch (fetch_type & ZEND_FETCH_CLASS_MASK) { @@ -1637,7 +1637,7 @@ zend_class_entry *zend_fetch_class_with_scope( return ce; } -zend_class_entry *zend_fetch_class_by_name(zend_string *class_name, zend_string *key, int fetch_type) /* {{{ */ +zend_class_entry *zend_fetch_class_by_name(zend_string *class_name, zend_string *key, uint32_t fetch_type) /* {{{ */ { zend_class_entry *ce = zend_lookup_class_ex(class_name, key, fetch_type); if (!ce) {