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

Assert substr from parameter is within the string

Browse Source 
Should catch #756 earlier if it happens again.
This commit is contained in:
Maxime Coste 2016-09-26 23:24:04 +01:00
parent a0c20a924a
commit 1e0ec182c1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/string.hh
View File

@ -231,7 +231,9 @@ inline StringView StringOps<Type, CharType>::substr(ByteCount from, ByteCount le
{
if (length < 0)
length = INT_MAX;
return StringView{ type().data() + (int)from, std::min(type().length() - from, length) };
const auto str_len = type().length();
kak_assert(from >= 0 and from <= str_len);
return StringView{ type().data() + (int)from, std::min(str_len - from, length) };
}
template<typename Type, typename CharType>