JDBtracker/libostd
1
0
Fork 0
forked from OctaForge/libostd
Code Issues Pull requests Releases Wiki Activity

actually safe string cmp

Browse source
This commit is contained in:
q66 2016-08-18 00:34:20 +01:00
parent c7862243a8
commit 17365642ef
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ostd/string.hh
View file

@ -173,11 +173,15 @@ public:
/* non-range */ /* non-range */
int compare(CharRangeBase<T const> s) const { int compare(CharRangeBase<T const> s) const {
ostd::Size s1 = size(), s2 = s.size(); ostd::Size s1 = size(), s2 = s.size();
int ret;
if (!s1 || !s2) { if (!s1 || !s2) {
return s1 - s2; goto diffsize;
} }
int ret = memcmp(data(), s.data(), ostd::min(s1, s2)); if ((ret = memcmp(data(), s.data(), ostd::min(s1, s2)))) {
return ret ? ret : (s1 - s2); return ret;
}
diffsize:
return (s1 < s2) ? -1 : ((s1 > s2) ? 1 : 0);
} }
template<typename R> template<typename R>