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

more tolerant Buffer::string

Browse Source
This commit is contained in:
Maxime Coste 2013-06-27 23:49:34 +02:00
parent b1f31d2e12
commit 5b4ef23b9d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/buffer.cc
View File

@ -129,15 +129,15 @@ LineCount Buffer::line_count() const
String Buffer::string(const BufferCoord& begin, const BufferCoord& end) const String Buffer::string(const BufferCoord& begin, const BufferCoord& end) const
{ {
String res; String res;
for (LineCount line = begin.line; line <= end.line; ++line) for (auto line = begin.line; line <= end.line and line < line_count(); ++line)
{ {
ByteCount start = 0; ByteCount start = 0;
if (line == begin.line) if (line == begin.line)
start = begin.column; start = begin.column;
ByteCount count = -1; ByteCount count = -1;
if (line == end.line) if (line == end.line)
count = end.column - start; count = end.column - start;
res += m_lines[line].content.substr(start, count); res += m_lines[line].content.substr(start, count);
} }
return res; return res;
} }