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

Fix segfault in get_until_delimiter

Browse Source
This commit is contained in:
Maxime Coste 2014-03-05 20:57:12 +00:00
parent 4ba99f7d6f
commit 8e0b5d67aa
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/command_manager.cc
View File

@ -102,20 +102,20 @@ String get_until_delimiter(const String& base, ByteCount& pos, char delimiter)
{ {
const ByteCount length = base.length(); const ByteCount length = base.length();
String str; String str;
while (true) while (pos < length)
{ {
char c = base[pos]; char c = base[pos];
if (c == delimiter) if (c == delimiter)
{ {
if (base[pos-1] != '\\') if (base[pos-1] != '\\')
return str; break;
str.back() = delimiter; str.back() = delimiter;
} }
else else
str += c; str += c;
if (++pos == length) ++pos;
return str;
} }
return str;
} }
String get_until_delimiter(const String& base, ByteCount& pos, String get_until_delimiter(const String& base, ByteCount& pos,