Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-31 16:48:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle failed memory allocations

Browse source 
svn path=/trunk/; revision=42870
This commit is contained in:
Gregor Schneider 2009-08-22 19:37:31 +00:00
parent 79c1f38e87
commit 030d5a52f3
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
reactos/dll/win32/gdi32/objects/font.c
View file

@ -118,6 +118,8 @@ static LPWSTR FONT_mbtowc(HDC hdc, LPCSTR str, INT count, INT *plenW, UINT *pCP)
if(count == -1) count = strlen(str); if(count == -1) count = strlen(str);
lenW = MultiByteToWideChar(cp, 0, str, count, NULL, 0); lenW = MultiByteToWideChar(cp, 0, str, count, NULL, 0);
strW = HeapAlloc(GetProcessHeap(), 0, lenW*sizeof(WCHAR)); strW = HeapAlloc(GetProcessHeap(), 0, lenW*sizeof(WCHAR));
if (!strW)
return NULL;
MultiByteToWideChar(cp, 0, str, count, strW, lenW); MultiByteToWideChar(cp, 0, str, count, strW, lenW);
DPRINT("mapped %s -> %S\n", str, strW); DPRINT("mapped %s -> %S\n", str, strW);
if(plenW) *plenW = lenW; if(plenW) *plenW = lenW;
@ -322,7 +324,13 @@ GetCharacterPlacementA(
lpStringW = FONT_mbtowc(hdc, lpString, uCount, &uCountW, &font_cp); lpStringW = FONT_mbtowc(hdc, lpString, uCount, &uCountW, &font_cp);
if(lpResults->lpOutString) if(lpResults->lpOutString)
{
resultsW.lpOutString = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*uCountW); resultsW.lpOutString = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*uCountW);
if (resultsW.lpOutString == NULL)
{
return 0;
}
}
ret = GetCharacterPlacementW(hdc, lpStringW, uCountW, nMaxExtent, &resultsW, dwFlags); ret = GetCharacterPlacementW(hdc, lpStringW, uCountW, nMaxExtent, &resultsW, dwFlags);
@ -993,7 +1001,13 @@ GetOutlineTextMetricsA(
if((ret = GetOutlineTextMetricsW(hdc, 0, NULL)) == 0) if((ret = GetOutlineTextMetricsW(hdc, 0, NULL)) == 0)
return 0; return 0;
if(ret > sizeof(buf)) if(ret > sizeof(buf))
lpOTMW = HeapAlloc(GetProcessHeap(), 0, ret); {
lpOTMW = HeapAlloc(GetProcessHeap(), 0, ret);
if (lpOTMW == NULL)
{
return 0;
}
}
GetOutlineTextMetricsW(hdc, ret, lpOTMW); GetOutlineTextMetricsW(hdc, ret, lpOTMW);
needed = sizeof(OUTLINETEXTMETRICA); needed = sizeof(OUTLINETEXTMETRICA);
@ -1021,10 +1035,16 @@ GetOutlineTextMetricsA(
DPRINT("needed = %d\n", needed); DPRINT("needed = %d\n", needed);
if(needed > cbData) if(needed > cbData)
{
/* Since the supplied buffer isn't big enough, we'll alloc one /* Since the supplied buffer isn't big enough, we'll alloc one
that is and memcpy the first cbData bytes into the lpOTM at that is and memcpy the first cbData bytes into the lpOTM at
the end. */ the end. */
output = HeapAlloc(GetProcessHeap(), 0, needed); output = HeapAlloc(GetProcessHeap(), 0, needed);
if (output == NULL)
{
goto end;
}
}
ret = output->otmSize = min(needed, cbData); ret = output->otmSize = min(needed, cbData);
FONT_TextMetricWToA( &lpOTMW->otmTextMetrics, &output->otmTextMetrics ); FONT_TextMetricWToA( &lpOTMW->otmTextMetrics, &output->otmTextMetrics );
@ -1207,6 +1227,10 @@ GetKerningPairsA( HDC hDC,
if (!cPairs && !kern_pairA) return total_kern_pairs; if (!cPairs && !kern_pairA) return total_kern_pairs;
kern_pairW = HeapAlloc(GetProcessHeap(), 0, total_kern_pairs * sizeof(*kern_pairW)); kern_pairW = HeapAlloc(GetProcessHeap(), 0, total_kern_pairs * sizeof(*kern_pairW));
if (kern_pairW == NULL)
{
return 0;
}
GetKerningPairsW(hDC, total_kern_pairs, kern_pairW); GetKerningPairsW(hDC, total_kern_pairs, kern_pairW);
for (i = 0; i < total_kern_pairs; i++) for (i = 0; i < total_kern_pairs; i++)