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

akien-mga · akien-mga · commit 622393c1156e · 2024-08-28T17:15:05.000+02:00
binder_common: Fix uninitialized marshalling for `PtrToArg&lt;char32_t&gt;`
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;
 	}
 };
 

Original file line number	Diff line number	Diff line change
`@@ -214,11 +214,11 @@ struct VariantCaster<char32_t> {`
`214`	`214`	`template <>`
`215`	`215`	`struct PtrToArg<char32_t> {`
`216`	`216`	`_FORCE_INLINE_ static char32_t convert(const void *p_ptr) {`
`217`		`- return char32_t(reinterpret_cast<const int >(p_ptr));`
	`217`	`+ return char32_t(reinterpret_cast<const int64_t >(p_ptr));`
`218`	`218`	`}`
`219`	`219`	`typedef int64_t EncodeT;`
`220`	`220`	`_FORCE_INLINE_ static void encode(char32_t p_val, const void *p_ptr) {`
`221`		`- (int )p_ptr = p_val;`
	`221`	`+ (int64_t )p_ptr = p_val;`
`222`	`222`	`}`
`223`	`223`	`};`
`224`	`224`