Merge pull request #32741 from qarmin/fix_string_utf_ascii

Don't use to_utf8() and to_ascii() on empty String

Merge pull request #32741 from qarmin/fix_string_utf_ascii
7f075e51 · Rémi Verschelde · GitHub · 197be41c · c62da553 · 7f075e51
Unverified Commit 7f075e51 authored Oct 11, 2019 by Rémi Verschelde Committed by GitHub Oct 11, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

variant_call.cpp core/variant_call.cpp +8 -0

No files found.
--- a/core/variant_call.cpp
+++ b/core/variant_call.cpp
@@ -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;