Merge pull request #26095 from lupoDharkael/right-left

Fix wrong bounds check in String::right
2019-02-20 17:48:53 +01:00 · 2019-02-20 17:48:53 +01:00 · 5023cc111b
parent 6d0ec870e3 597aac382b
commit 5023cc111b
1 changed files with 4 additions and 4 deletions
--- a/core/ustring.cpp
+++ b/core/ustring.cpp
@ -2945,12 +2945,12 @@ String String::left(int p_pos) const {

 String String::right(int p_pos) const {

-	if (p_pos >= size())
-		return *this;
-
-	if (p_pos < 0)
+	if (p_pos >= length())
 		return "";

+	if (p_pos <= 0)
+		return *this;
+
 	return substr(p_pos, (length() - p_pos));
 }