xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix StringView::substr when passed a negative length

Browse Source
This commit is contained in:
Maxime Coste 2014-04-20 12:03:57 +01:00
parent 055eacd032
commit c4295b7e30
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/string.hh
View File

@ -150,11 +150,15 @@ inline CharCount StringView::char_count_to(ByteCount count) const
inline StringView StringView::substr(ByteCount from, ByteCount length) const inline StringView StringView::substr(ByteCount from, ByteCount length) const
{ {
if (length < 0)
length = INT_MAX;
return StringView{ m_data + (int)from, std::min(m_length - from, length) }; return StringView{ m_data + (int)from, std::min(m_length - from, length) };
} }
inline StringView StringView::substr(CharCount from, CharCount length) const inline StringView StringView::substr(CharCount from, CharCount length) const
{ {
if (length < 0)
length = INT_MAX;
auto beg = utf8::advance(begin(), end(), (int)from); auto beg = utf8::advance(begin(), end(), (int)from);
return StringView{ beg, utf8::advance(beg, end(), length) }; return StringView{ beg, utf8::advance(beg, end(), length) };
} }