[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690
Alexandre Julliard
julliard at winehq.org
Sun Jun 17 20:03:48 UTC 2012
The following commit has been merged in the wheezy branch:
commit 607c21876aeecf25598cd3ca065aaaeabc87c3fd
Author: Aric Stewart <aric at codeweavers.com>
Date: Fri May 25 07:55:19 2012 -0500
usp10: Check bounds before checking value in array.
(cherry picked from commit 1f4554d141774e948a29731db72ce5758ddad2f5)
diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c
index 5ba6e6f..efb9b71 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];
}
}
--
Debian Wine packaging
More information about the pkg-wine-party
mailing list