NewLife
/
SmartOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修正字符串比较大小CompareTo的错误

This commit is contained in:
大石头 2017-08-20 23:03:35 +08:00
parent 02ed5ed155
commit f36953befc
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Core/String.cpp
View File

@ -556,11 +556,25 @@ int String::CompareTo(cstring cstr, int len, bool ignoreCase) const
}
if (!cstr && _Arr && _Length > 0) return 1;
// 小心越界
int len2 = len;
if (len2 > _Length) len2 = _Length;
// 逐个比较字符，直到指定长度或者源字符串结束
int rs = 0;
if (ignoreCase)
return strncasecmp(_Arr, cstr, _Length);
rs = strncasecmp(_Arr, cstr, len2);
else
return strncmp(_Arr, cstr, _Length);
rs = strncmp(_Arr, cstr, len2);
// 如果不等，直接返回
if (rs != 0)return rs;
// 如果相等，则还要考虑没有比较部分
if (len > len2) return -1;
if (_Length > len2) return 1;
return 0;
}
bool String::Equals(const String& str) const