Merge pull request #45309 from VedatGunel/fix-string-ends-with

Fix String.ends_with() for empty string arguments
This commit is contained in:
Rémi Verschelde 2021-01-26 15:23:59 +01:00 committed by GitHub
commit 1940197ac7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3074,11 +3074,16 @@ int String::rfindn(const String &p_str, int p_from) const {
}
bool String::ends_with(const String &p_string) const {
int l = p_string.length();
if (l == 0) {
return true;
}
int pos = rfind(p_string);
if (pos == -1) {
return false;
}
return pos + p_string.length() == length();
return pos + l == length();
}
bool String::begins_with(const String &p_string) const {