Nikolay Sivov : dwrite: Sanitize specified stretch value, valid range is [ 1, 9].

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 1a5fa5f1ac0beba5b4311ce3252b44d413644bb6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1a5fa5f1ac0beba5b4311ce325...

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Sat Aug 13 22:21:13 2016 +0300

dwrite: Sanitize specified stretch value, valid range is [1, 9].

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit ff57b1febba846fe30f420519b4aec2a1f23dc35)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/dwrite/opentype.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c
index 4799088..9e3e156 100644
--- a/dlls/dwrite/opentype.c
+++ b/dlls/dwrite/opentype.c
@@ -1083,9 +1083,10 @@ void opentype_get_font_properties(IDWriteFontFileStream *stream, DWRITE_FONT_FAC
         USHORT version = GET_BE_WORD(tt_os2->version);
         USHORT fsSelection = GET_BE_WORD(tt_os2->fsSelection);
         USHORT usWeightClass = GET_BE_WORD(tt_os2->usWeightClass);
+        USHORT usWidthClass = GET_BE_WORD(tt_os2->usWidthClass);
 
-        if (GET_BE_WORD(tt_os2->usWidthClass) <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED)
-            props->stretch = GET_BE_WORD(tt_os2->usWidthClass);
+        if (usWidthClass > DWRITE_FONT_STRETCH_UNDEFINED && usWidthClass <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED)
+            props->stretch = usWidthClass;
 
         if (usWeightClass >= 1 && usWeightClass <= 9)
             usWeightClass *= 100;