mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

editor: Improve checks on delete add asserts

Browse Source 
Signed-off-by: Jan Arne Petersen <jpetersen@openismus.com>
This commit is contained in:
Jan Arne Petersen
2013-05-30 13:57:04 +02:00
committed by Kristian Høgsberg
parent 9eaa8e51ca
commit 895a128ce1
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/editor.c
+5 -1
View File
@@ -214,7 +214,8 @@ text_input_delete_surrounding_text(void *data,
return; return;
} }
if (entry->pending_commit.delete_index + length > text_length) { if (length > text_length ||
entry->pending_commit.delete_index + length > text_length) {
fprintf(stderr, "Invalid length %d\n", length); fprintf(stderr, "Invalid length %d\n", length);
entry->pending_commit.delete_length = 0; entry->pending_commit.delete_length = 0;
return; return;
@@ -837,6 +838,9 @@ text_entry_delete_text(struct text_entry *entry,
{ {
uint32_t l; uint32_t l;
assert(index <= strlen(entry->text));
assert(index + length <= strlen(entry->text));
assert(index + length >= length);
l = strlen(entry->text + index + length); l = strlen(entry->text + index + length);
memmove(entry->text + index, memmove(entry->text + index,