godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

binder_common: Fix uninitialized marshalling for `PtrToArg<char32_t>`
This commit is contained in:
Rémi Verschelde 2024-08-28 17:15:05 +02:00
parent 3bc84c2988 e6a7c63125
commit 622393c115
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/variant/binder_common.h
View File

@ -214,11 +214,11 @@ struct VariantCaster<char32_t> {
template <> template <>
struct PtrToArg<char32_t> { struct PtrToArg<char32_t> {
_FORCE_INLINE_ static char32_t convert(const void *p_ptr) { _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; typedef int64_t EncodeT;
_FORCE_INLINE_ static void encode(char32_t p_val, const void *p_ptr) { _FORCE_INLINE_ static void encode(char32_t p_val, const void *p_ptr) {
*(int *)p_ptr = p_val; *(int64_t *)p_ptr = p_val;
} }
}; };