From bf0e7573e101636abf96ec83ceb8dcbada23ea5d Mon Sep 17 00:00:00 2001
From: nyamatongwe <devnull@localhost>
Date: Fri, 18 May 2007 01:11:02 +0000
Subject: Protection against bad UTF-8 sequences.

---
 win32/PlatWin.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'win32')

diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx
index f9a9fa1c5..36479e0f2 100644
--- a/win32/PlatWin.cxx
+++ b/win32/PlatWin.cxx
@@ -787,7 +787,7 @@ void SurfaceImpl::MeasureWidths(Font &font_, const char *s, int len, int *positi
 			} else if (uch >= (0x80)) {
 				lenChar = 2;
 			}
-			for (unsigned int bytePos=0; bytePos<lenChar; bytePos++) {
+			for (unsigned int bytePos=0; (bytePos<lenChar) && (i<len); bytePos++) {
 				positions[i++] = poses[ui];
 			}
 			ui++;
-- 
cgit v1.2.3