Merge pull request #95317 from esainane/when-i-am-64

binder_common: Fix uninitialized marshalling for `PtrToArg<char32_t>`
godotengine · Aug 28, 2024 · 622393c · 622393c
2 parents 3bc84c2 + e6a7c63
commit 622393c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/variant/binder_common.h b/core/variant/binder_common.h
@@ -214,11 +214,11 @@ struct VariantCaster<char32_t> {
 template <>
 struct PtrToArg<char32_t> {
 	_FORCE_INLINE_ static char32_t convert(const void *p_ptr) {
-		return char32_t(*reinterpret_cast<const int *>(p_ptr));
+		return char32_t(*reinterpret_cast<const int64_t *>(p_ptr));
 	}
 	typedef int64_t EncodeT;
 	_FORCE_INLINE_ static void encode(char32_t p_val, const void *p_ptr) {
-		*(int *)p_ptr = p_val;
+		*(int64_t *)p_ptr = p_val;
 	}
 };