From 607c21876aeecf25598cd3ca065aaaeabc87c3fd Mon Sep 17 00:00:00 2001
From: Aric Stewart <aric@codeweavers.com>
Date: Fri, 25 May 2012 07:55:19 -0500
Subject: [PATCH] usp10: Check bounds before checking value in array. (cherry
 picked from commit 1f4554d141774e948a29731db72ce5758ddad2f5)

---
 dlls/usp10/shape.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c
index 5ba6e6f3ec7..efb9b7139bf 100644
--- a/dlls/usp10/shape.c
+++ b/dlls/usp10/shape.c
@@ -628,9 +628,9 @@ static void UpdateClustersFromGlyphProp(const int cGlyphs, const int cChars, WOR
                 if (pwLogClust[j] == i)
                 {
                     int k = j;
-                    while (!pGlyphProp[pwLogClust[k]].sva.fClusterStart && k >= 0 && k <cChars)
+                    while (k >= 0 && k <cChars && !pGlyphProp[pwLogClust[k]].sva.fClusterStart)
                         k-=1;
-                    if (pGlyphProp[pwLogClust[k]].sva.fClusterStart)
+                    if (k >= 0 && k <cChars && pGlyphProp[pwLogClust[k]].sva.fClusterStart)
                         pwLogClust[j] = pwLogClust[k];
                 }
             }
-- 
2.11.4.GIT