ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Reject invalid character range in GetCharABCWidthsA.

Browse Source
This commit is contained in:
Kusanagi Kouichi 2011-01-27 01:09:03 +09:00 committed by Alexandre Julliard
parent c706ecea82
commit c117d45cb3
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/gdi32/font.c
View File

@ -1553,7 +1553,7 @@ UINT WINAPI GetOutlineTextMetricsW(
return ret; return ret;
} }
static LPSTR FONT_GetCharsByRangeA(UINT firstChar, UINT lastChar, PINT pByteLen) static LPSTR FONT_GetCharsByRangeA(HDC hdc, UINT firstChar, UINT lastChar, PINT pByteLen)
{ {
INT i, count = lastChar - firstChar + 1; INT i, count = lastChar - firstChar + 1;
UINT c; UINT c;
@ -1562,6 +1562,22 @@ static LPSTR FONT_GetCharsByRangeA(UINT firstChar, UINT lastChar, PINT pByteLen)
if (count <= 0) if (count <= 0)
return NULL; return NULL;
switch (GdiGetCodePage(hdc))
{
case 932:
case 936:
case 949:
case 950:
case 1361:
if (lastChar > 0xffff)
return NULL;
break;
default:
if (lastChar > 0xff)
return NULL;
break;
}
str = HeapAlloc(GetProcessHeap(), 0, count * 2 + 1); str = HeapAlloc(GetProcessHeap(), 0, count * 2 + 1);
if (str == NULL) if (str == NULL)
return NULL; return NULL;
@ -1620,7 +1636,7 @@ BOOL WINAPI GetCharWidth32A( HDC hdc, UINT firstChar, UINT lastChar,
LPWSTR wstr; LPWSTR wstr;
BOOL ret = TRUE; BOOL ret = TRUE;
str = FONT_GetCharsByRangeA(firstChar, lastChar, &i); str = FONT_GetCharsByRangeA(hdc, firstChar, lastChar, &i);
if(str == NULL) if(str == NULL)
return FALSE; return FALSE;
@ -2324,7 +2340,7 @@ BOOL WINAPI GetCharABCWidthsA(HDC hdc, UINT firstChar, UINT lastChar,
LPWSTR wstr; LPWSTR wstr;
BOOL ret = TRUE; BOOL ret = TRUE;
str = FONT_GetCharsByRangeA(firstChar, lastChar, &i); str = FONT_GetCharsByRangeA(hdc, firstChar, lastChar, &i);
if (str == NULL) if (str == NULL)
return FALSE; return FALSE;
@ -3010,7 +3026,7 @@ BOOL WINAPI GetCharABCWidthsFloatA( HDC hdc, UINT first, UINT last, LPABCFLOAT a
LPWSTR wstr; LPWSTR wstr;
BOOL ret = TRUE; BOOL ret = TRUE;
str = FONT_GetCharsByRangeA(first, last, &i); str = FONT_GetCharsByRangeA(hdc, first, last, &i);
if (str == NULL) if (str == NULL)
return FALSE; return FALSE;

9
dlls/gdi32/tests/font.c
View File

@ -1011,39 +1011,30 @@ static void test_GetCharABCWidths(void)
ok(ret == c[i].r[0], "GetCharABCWidthsA should have %s\n", c[i].r[0] ? "succeeded" : "failed"); ok(ret == c[i].r[0], "GetCharABCWidthsA should have %s\n", c[i].r[0] ? "succeeded" : "failed");
ret = pGetCharABCWidthsA(hdc, 0x100, 0x100, abc); ret = pGetCharABCWidthsA(hdc, 0x100, 0x100, abc);
todo_wine
ok(ret == c[i].r[1], "GetCharABCWidthsA should have %s\n", c[i].r[1] ? "succeeded" : "failed"); ok(ret == c[i].r[1], "GetCharABCWidthsA should have %s\n", c[i].r[1] ? "succeeded" : "failed");
ret = pGetCharABCWidthsA(hdc, 0xff, 0x100, a); ret = pGetCharABCWidthsA(hdc, 0xff, 0x100, a);
todo_wine
ok(ret == c[i].r[2], "GetCharABCWidthsA should have %s\n", c[i].r[2] ? "succeeded" : "failed"); ok(ret == c[i].r[2], "GetCharABCWidthsA should have %s\n", c[i].r[2] ? "succeeded" : "failed");
ret = pGetCharABCWidthsA(hdc, 0xffff, 0xffff, abc); ret = pGetCharABCWidthsA(hdc, 0xffff, 0xffff, abc);
todo_wine
ok(ret == c[i].r[3], "GetCharABCWidthsA should have %s\n", c[i].r[3] ? "succeeded" : "failed"); ok(ret == c[i].r[3], "GetCharABCWidthsA should have %s\n", c[i].r[3] ? "succeeded" : "failed");
ret = pGetCharABCWidthsA(hdc, 0x10000, 0x10000, abc); ret = pGetCharABCWidthsA(hdc, 0x10000, 0x10000, abc);
todo_wine
ok(ret == c[i].r[4], "GetCharABCWidthsA should have %s\n", c[i].r[4] ? "succeeded" : "failed"); ok(ret == c[i].r[4], "GetCharABCWidthsA should have %s\n", c[i].r[4] ? "succeeded" : "failed");
ret = pGetCharABCWidthsA(hdc, 0xffff, 0x10000, a); ret = pGetCharABCWidthsA(hdc, 0xffff, 0x10000, a);
todo_wine
ok(ret == c[i].r[5], "GetCharABCWidthsA should have %s\n", c[i].r[5] ? "succeeded" : "failed"); ok(ret == c[i].r[5], "GetCharABCWidthsA should have %s\n", c[i].r[5] ? "succeeded" : "failed");
ret = pGetCharABCWidthsA(hdc, 0xffffff, 0xffffff, abc); ret = pGetCharABCWidthsA(hdc, 0xffffff, 0xffffff, abc);
todo_wine
ok(ret == c[i].r[6], "GetCharABCWidthsA should have %s\n", c[i].r[6] ? "succeeded" : "failed"); ok(ret == c[i].r[6], "GetCharABCWidthsA should have %s\n", c[i].r[6] ? "succeeded" : "failed");
ret = pGetCharABCWidthsA(hdc, 0x1000000, 0x1000000, abc); ret = pGetCharABCWidthsA(hdc, 0x1000000, 0x1000000, abc);
todo_wine
ok(ret == c[i].r[7], "GetCharABCWidthsA should have %s\n", c[i].r[7] ? "succeeded" : "failed"); ok(ret == c[i].r[7], "GetCharABCWidthsA should have %s\n", c[i].r[7] ? "succeeded" : "failed");
ret = pGetCharABCWidthsA(hdc, 0xffffff, 0x1000000, a); ret = pGetCharABCWidthsA(hdc, 0xffffff, 0x1000000, a);
todo_wine
ok(ret == c[i].r[8], "GetCharABCWidthsA should have %s\n", c[i].r[8] ? "succeeded" : "failed"); ok(ret == c[i].r[8], "GetCharABCWidthsA should have %s\n", c[i].r[8] ? "succeeded" : "failed");
ret = pGetCharABCWidthsA(hdc, 0xffffffff, 0xffffffff, abc); ret = pGetCharABCWidthsA(hdc, 0xffffffff, 0xffffffff, abc);
todo_wine
ok(ret == c[i].r[9], "GetCharABCWidthsA should have %s\n", c[i].r[9] ? "succeeded" : "failed"); ok(ret == c[i].r[9], "GetCharABCWidthsA should have %s\n", c[i].r[9] ? "succeeded" : "failed");
hfont = SelectObject(hdc, hfont); hfont = SelectObject(hdc, hfont);