Fix PackedStringArray.to_byte_array() to return UTF-8 encoded data instead of pointers.

This commit is contained in:
Pāvels Nadtočajevs
2025-02-07 10:19:19 +02:00
parent 06acfccf89
commit 1bc86c2626
2 changed files with 14 additions and 2 deletions

View File

@@ -1034,6 +1034,18 @@ struct _VariantCall {
return len;
}
static PackedByteArray func_PackedStringArray_to_byte_array(PackedStringArray *p_instance) {
PackedByteArray ret;
uint64_t size = p_instance->size();
const String *r = p_instance->ptr();
for (uint64_t i = 0; i < size; i++) {
ret.append_array(r[i].to_utf8_buffer());
ret.append(0);
}
return ret;
}
static void func_Callable_call(Variant *v, const Variant **p_args, int p_argcount, Variant &r_ret, Callable::CallError &r_error) {
Callable *callable = VariantGetInternalPtr<Callable>::get_ptr(v);
callable->callp(p_args, p_argcount, r_ret, r_error);
@@ -2577,7 +2589,7 @@ static void _register_variant_builtin_methods_array() {
bind_method(PackedStringArray, has, sarray("value"), varray());
bind_method(PackedStringArray, reverse, sarray(), varray());
bind_method(PackedStringArray, slice, sarray("begin", "end"), varray(INT_MAX));
bind_method(PackedStringArray, to_byte_array, sarray(), varray());
bind_function(PackedStringArray, to_byte_array, _VariantCall::func_PackedStringArray_to_byte_array, sarray(), varray());
bind_method(PackedStringArray, sort, sarray(), varray());
bind_method(PackedStringArray, bsearch, sarray("value", "before"), varray(true));
bind_method(PackedStringArray, duplicate, sarray(), varray());

View File

@@ -193,7 +193,7 @@
<method name="to_byte_array" qualifiers="const">
<return type="PackedByteArray" />
<description>
Returns a [PackedByteArray] with each string encoded as bytes.
Returns a [PackedByteArray] with each string encoded as UTF-8. Strings are [code]null[/code] terminated.
</description>
</method>
</methods>