UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-22 07:10:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

[unicode] Fix stop condition in TextArea::Text::removeRemainingLine

Browse Source
This commit is contained in:
Léa Saviot
2019-01-29 11:31:09 +01:00
committed by Émilie Feral
parent f4cf7530f6
commit c9feec7cd7
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
escher/src/text_area.cpp
View File

@@ -224,7 +224,7 @@ size_t TextArea::Text::removeRemainingLine(const char * location, int direction)
}
while (nextCodePoint != '\n'
&& ((direction > 0 && nextCodePoint != 0)
|| (direction < 0 && codePointPosition >= m_buffer)))
|| (direction < 0 && codePointPosition > m_buffer)))
{
if (direction > 0) {
codePointPosition = decoder.stringPosition();
@@ -234,14 +234,15 @@ size_t TextArea::Text::removeRemainingLine(const char * location, int direction)
codePointPosition = decoder.stringPosition();
}
}
size_t delta = direction > 0 ? codePointPosition - location : location - codePointPosition;
if (delta == 0) {
return 0;
}
char * dst = const_cast<char* >(direction > 0 ? location : codePointPosition);
char * src = const_cast<char* >(direction > 0 ? codePointPosition : location);
assert(src > dst);
assert(src >= dst);
size_t delta = src - dst;
if (delta == 0) {
return 0;
}
for (size_t index = src - m_buffer; index < m_bufferSize; index++) {
*dst = *src;
if (*src == 0) {