gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-06 03:43:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32741 from qarmin/fix_string_utf_ascii

Browse source 
Don't use to_utf8() and to_ascii() on empty String
This commit is contained in:
Rémi Verschelde 2019-10-11 11:24:40 +02:00 committed by GitHub
parent 197be41cca c62da553cb
commit 7f075e519a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/variant_call.cpp
View file

@ -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;