Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-03-28 06:46:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix logic in String::substr_index.

Browse Source
This commit is contained in:
Relintai 2023-12-22 15:35:35 +01:00
parent a781853b2b
commit 4d6b2f6f55
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/string/ustring.cpp
View File

@ -926,7 +926,7 @@ String String::substr(int p_from, int p_chars) const {
String String::substr_index(const int start_index, const int end_index) const { String String::substr_index(const int start_index, const int end_index) const {
int s = length(); int s = length();
if (start_index < 0 || start_index >= s || end_index < 0 || start_index >= s) { if (start_index < 0 || start_index >= s || end_index < 0) {
return ""; return "";
} }
@ -934,6 +934,10 @@ String String::substr_index(const int start_index, const int end_index) const {
return ""; return "";
} }
if (end_index >= s) {
return substr(start_index, (s - 1) - start_index);
}
return substr(start_index, end_index - start_index); return substr(start_index, end_index - start_index);
} }