From c9672172dc7d26fb18098976863e83dd60e46760 Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Thu, 24 Jun 2010 06:46:03 +0000
Subject: Protect against bad UTF-8 when case folding.

---
 win32/ScintillaWin.cxx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index ce959f893..31a7a0ab5 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -1314,6 +1314,12 @@ public:
 			size_t nUtf16Mixed = ::MultiByteToWideChar(65001, 0, mixed, lenMixed,
 				&utf16Mixed[0], utf16Mixed.size());
 
+			if (nUtf16Mixed == 0) {
+				// Failed to convert -> bad UTF-8
+				folded[0] = '\0';
+				return 1;
+			}
+
 			if (nUtf16Mixed * 4 > utf16Folded.size()) {	// Maximum folding expansion factor of 4
 				utf16Folded.resize(nUtf16Mixed * 4 + 8);
 			}
-- 
cgit v1.2.3