diff options
Diffstat (limited to 'core/ustring.cpp')
| -rw-r--r-- | core/ustring.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/ustring.cpp b/core/ustring.cpp index f53829fe21..d119e341c3 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -2501,19 +2501,21 @@ bool String::begins_with(const String& p_string) const { const CharType *src=&p_string[0]; const CharType *str=&operator[](0); - for (int i=0;i<l;i++) { + int i = 0; + for (;i<l;i++) { if (src[i]!=str[i]) return false; } - return true; + // only if i == l the p_string matches the beginning + return i == l; } bool String::begins_with(const char* p_string) const { int l=length(); - if (l==0) + if (l==0||!p_string) return false; const CharType *str=&operator[](0); |