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

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dwrite: Sanitize specified stretch value, valid range is [1, 9].
ff57b1fe · Nikolay Sivov · Alexandre Julliard · cc8cc65f · ff57b1fe
Commit ff57b1fe authored Aug 13, 2016 by Nikolay Sivov Committed by Alexandre Julliard Aug 15, 2016
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

opentype.c dlls/dwrite/opentype.c +3 -2

No files found.
--- a/dlls/dwrite/opentype.c
+++ b/dlls/dwrite/opentype.c
@@ -1291,9 +1291,10 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d
        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;