mirror of
https://github.com/godotengine/godot
synced 2024-09-06 03:43:51 +00:00
Merge pull request #32741 from qarmin/fix_string_utf_ascii
Don't use to_utf8() and to_ascii() on empty String
This commit is contained in:
commit
7f075e519a
|
@ -316,6 +316,10 @@ struct _VariantCall {
|
|||
static void _call_String_to_ascii(Variant &r_ret, Variant &p_self, const Variant **p_args) {
|
||||
|
||||
String *s = reinterpret_cast<String *>(p_self._data._mem);
|
||||
if (s->empty()) {
|
||||
r_ret = PoolByteArray();
|
||||
return;
|
||||
}
|
||||
CharString charstr = s->ascii();
|
||||
|
||||
PoolByteArray retval;
|
||||
|
@ -331,6 +335,10 @@ struct _VariantCall {
|
|||
static void _call_String_to_utf8(Variant &r_ret, Variant &p_self, const Variant **p_args) {
|
||||
|
||||
String *s = reinterpret_cast<String *>(p_self._data._mem);
|
||||
if (s->empty()) {
|
||||
r_ret = PoolByteArray();
|
||||
return;
|
||||
}
|
||||
CharString charstr = s->utf8();
|
||||
|
||||
PoolByteArray retval;
|
||||
|
|
Loading…
Reference in a new issue