From ee6bf8016daed4204b25ed680e9e5b5fab953e33 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Thu, 17 Feb 2022 21:55:04 +1100
Subject: Add extra condition to avoid Clang-Tidy warning.

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

diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx
index 9a41614cd..6a77aab3f 100644
--- a/win32/PlatWin.cxx
+++ b/win32/PlatWin.cxx
@@ -2548,7 +2548,7 @@ void SurfaceD2D::MeasureWidthsUTF8(const Font *font_, std::string_view text, XYP
 			ui++;
 			PLATFORM_ASSERT(ui < ti);
 		}
-		for (unsigned int bytePos=0; (bytePos<byteCount) && (i<text.length()); bytePos++) {
+		for (unsigned int bytePos=0; (bytePos<byteCount) && (i<text.length()) && (ui < tbuf.tlen); bytePos++) {
 			positions[i++] = poses.buffer[ui];
 		}
 	}
-- 
cgit v1.2.3