Nikolay Sivov : dwrite: Sanitize specified stretch value, valid range is [ 1, 9].
Alexandre Julliard
julliard at winehq.org
Mon Aug 15 10:37:29 CDT 2016
Module: wine
Branch: master
Commit: ff57b1febba846fe30f420519b4aec2a1f23dc35
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff57b1febba846fe30f420519b4aec2a1f23dc35
Author: Nikolay Sivov <nsivov at 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 at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at 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 b35f1df..7f4a208 100644
--- 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;
More information about the wine-cvs
mailing list