From 895a128ce1b201e3c6169c2eb95e2337e2f1d457 Mon Sep 17 00:00:00 2001 From: Jan Arne Petersen Date: Thu, 30 May 2013 13:57:04 +0200 Subject: [PATCH] editor: Improve checks on delete add asserts Signed-off-by: Jan Arne Petersen --- clients/editor.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/clients/editor.c b/clients/editor.c index 35f6d086d..cd24f6ab0 100644 --- a/clients/editor.c +++ b/clients/editor.c @@ -214,7 +214,8 @@ text_input_delete_surrounding_text(void *data, 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); entry->pending_commit.delete_length = 0; return; @@ -837,6 +838,9 @@ text_entry_delete_text(struct text_entry *entry, { uint32_t l; + assert(index <= strlen(entry->text)); + assert(index + length <= strlen(entry->text)); + assert(index + length >= length); l = strlen(entry->text + index + length); memmove(entry->text + index,