UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[escher/text_area] Fix overlap in textInsert

Browse Source
This commit is contained in:
Léa Saviot
2020-03-31 15:41:04 +02:00
committed by Émilie Feral
parent af3394d35a
commit 6311f408b4
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
escher/src/text_area.cpp
View File

@@ -237,11 +237,16 @@ void TextArea::Text::insertText(const char * s, int textLength, char * location)
assert(m_buffer != nullptr);
assert(location >= m_buffer && location < m_buffer + m_bufferSize - 1);
assert(strlen(m_buffer) + textLength < m_bufferSize);
// assert the text to insert does not overlap the location where to insert
assert(s >= location || s + textLength < location);
/* The text to insert might be located after the insertion location, in which
* case we cannot simply do a memmove, as s will be shifted by the copy. */
bool noShift = (s + textLength < location) || (s > m_buffer + m_bufferSize);
size_t sizeToMove = strlen(location) + 1;
assert(location + textLength + sizeToMove <= m_buffer + m_bufferSize);
memmove(location + textLength, location, sizeToMove);
memmove(location, s, textLength);
memmove(location, s + (noShift ? 0 : textLength), textLength);
}
void TextArea::Text::insertSpacesAtLocation(int numberOfSpaces, char * location) {