From 6ab788d35277557b75338a8729d12a2528803529 Mon Sep 17 00:00:00 2001
From: nyamatongwe <devnull@localhost>
Date: Sun, 19 May 2013 21:25:29 +1000
Subject: Don't dereference character string when length is 0. May be a NULL
 pointer and cause a crash and shouldn't read beyond length anyway.

---
 src/Editor.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Editor.cxx b/src/Editor.cxx
index 2ebe1a759..59e2678ab 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -4147,7 +4147,7 @@ void Editor::AddCharUTF(char *s, unsigned int len, bool treatAsDBCS) {
 	if (treatAsDBCS) {
 		NotifyChar((static_cast<unsigned char>(s[0]) << 8) |
 		        static_cast<unsigned char>(s[1]));
-	} else {
+	} else if (len > 0) {
 		int byte = static_cast<unsigned char>(s[0]);
 		if ((byte < 0xC0) || (1 == len)) {
 			// Handles UTF-8 characters between 0x01 and 0x7F and single byte
-- 
cgit v1.2.3