diff options
| author | Haoyu Qiu <timothyqiu32@gmail.com> | 2024-08-16 13:23:04 +0800 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-16 16:40:48 +0200 |
| commit | 562e583872036ea9e3683e447f85e94791b2ecc4 (patch) | |
| tree | 1fb421988c131042e3cce1cb9b3fe0c3bc5caea3 /core | |
| parent | cfa33666c9055215746e2c489d9d6110ef78995d (diff) | |
| download | redot-engine-562e583872036ea9e3683e447f85e94791b2ecc4.tar.gz | |
Fix split_floats behavior when spaces are used as separators
(cherry picked from commit f483c3aafa5f3cfb1ab763ab4eb077aac74e88d6)
Diffstat (limited to 'core')
| -rw-r--r-- | core/string/ustring.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/string/ustring.cpp b/core/string/ustring.cpp index 3d37e17ef8..07d754daf7 100644 --- a/core/string/ustring.cpp +++ b/core/string/ustring.cpp @@ -1537,13 +1537,16 @@ Vector<double> String::split_floats(const String &p_splitter, bool p_allow_empty int from = 0; int len = length(); + String buffer = *this; while (true) { int end = find(p_splitter, from); if (end < 0) { end = len; } if (p_allow_empty || (end > from)) { - ret.push_back(String::to_float(&get_data()[from])); + buffer[end] = 0; + ret.push_back(String::to_float(&buffer.get_data()[from])); + buffer[end] = _cowdata.get(end); } if (end == len) { @@ -1561,6 +1564,7 @@ Vector<float> String::split_floats_mk(const Vector<String> &p_splitters, bool p_ int from = 0; int len = length(); + String buffer = *this; while (true) { int idx; int end = findmk(p_splitters, from, &idx); @@ -1572,7 +1576,9 @@ Vector<float> String::split_floats_mk(const Vector<String> &p_splitters, bool p_ } if (p_allow_empty || (end > from)) { - ret.push_back(String::to_float(&get_data()[from])); + buffer[end] = 0; + ret.push_back(String::to_float(&buffer.get_data()[from])); + buffer[end] = _cowdata.get(end); } if (end == len) { |