Akihiro Sagawa : gdi32: Avoid an integer overflow in GetCharABCWidthsA.
Alexandre Julliard
julliard at winehq.org
Mon Jan 17 10:59:49 CST 2011
Module: wine
Branch: master
Commit: d4924bf9a162a0045ac35e78b8a2785671137ddf
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4924bf9a162a0045ac35e78b8a2785671137ddf
Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date: Sun Jan 16 23:00:21 2011 +0900
gdi32: Avoid an integer overflow in GetCharABCWidthsA.
---
dlls/gdi32/font.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 75a714b..cf29add 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -2296,16 +2296,16 @@ BOOL WINAPI GetAspectRatioFilterEx( HDC hdc, LPSIZE pAspectRatio )
BOOL WINAPI GetCharABCWidthsA(HDC hdc, UINT firstChar, UINT lastChar,
LPABC abc )
{
- INT i, wlen;
+ INT i, wlen, count = (INT)(lastChar - firstChar + 1);
UINT c;
LPSTR str;
LPWSTR wstr;
BOOL ret = TRUE;
- if (lastChar < firstChar)
+ if (count <= 0)
return FALSE;
- str = HeapAlloc(GetProcessHeap(), 0, (lastChar - firstChar + 1) * 2 + 1);
+ str = HeapAlloc(GetProcessHeap(), 0, count * 2 + 1);
if (str == NULL)
return FALSE;
More information about the wine-cvs
mailing list