reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 12:49:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gdi32: Fix incorrect initialization of path array.

Browse Source 
Found by Valgrind.
This commit is contained in:
Huw Davies 2009-12-02 12:04:08 +00:00 committed by Alexandre Julliard
parent c5b346440f
commit b5ca0a9c2a
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/gdi32/path.c
View File

@ -1852,7 +1852,7 @@ static BOOL PATH_WidenPath(DC *dc)
{ {
INT i, j, numStrokes, penWidth, penWidthIn, penWidthOut, size, penStyle; INT i, j, numStrokes, penWidth, penWidthIn, penWidthOut, size, penStyle;
BOOL ret = FALSE; BOOL ret = FALSE;
GdiPath *pPath, *pNewPath, **pStrokes, *pUpPath, *pDownPath; GdiPath *pPath, *pNewPath, **pStrokes = NULL, *pUpPath, *pDownPath;
EXTLOGPEN *elp; EXTLOGPEN *elp;
DWORD obj_type, joint, endcap, penType; DWORD obj_type, joint, endcap, penType;
@ -1907,13 +1907,6 @@ static BOOL PATH_WidenPath(DC *dc)
numStrokes = 0; numStrokes = 0;
pStrokes = HeapAlloc(GetProcessHeap(), 0, numStrokes * sizeof(GdiPath*));
pStrokes[0] = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath));
PATH_InitGdiPath(pStrokes[0]);
pStrokes[0]->pFlags = HeapAlloc(GetProcessHeap(), 0, pPath->numEntriesUsed * sizeof(INT));
pStrokes[0]->pPoints = HeapAlloc(GetProcessHeap(), 0, pPath->numEntriesUsed * sizeof(POINT));
pStrokes[0]->numEntriesUsed = 0;
for(i = 0, j = 0; i < pPath->numEntriesUsed; i++, j++) { for(i = 0, j = 0; i < pPath->numEntriesUsed; i++, j++) {
POINT point; POINT point;
if((i == 0 || (pPath->pFlags[i-1] & PT_CLOSEFIGURE)) && if((i == 0 || (pPath->pFlags[i-1] & PT_CLOSEFIGURE)) &&
@ -1930,7 +1923,11 @@ static BOOL PATH_WidenPath(DC *dc)
} }
numStrokes++; numStrokes++;
j = 0; j = 0;
if(numStrokes == 1)
pStrokes = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath*));
else
pStrokes = HeapReAlloc(GetProcessHeap(), 0, pStrokes, numStrokes * sizeof(GdiPath*)); pStrokes = HeapReAlloc(GetProcessHeap(), 0, pStrokes, numStrokes * sizeof(GdiPath*));
if(!pStrokes) return FALSE;
pStrokes[numStrokes - 1] = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath)); pStrokes[numStrokes - 1] = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath));
PATH_InitGdiPath(pStrokes[numStrokes - 1]); PATH_InitGdiPath(pStrokes[numStrokes - 1]);
pStrokes[numStrokes - 1]->state = PATH_Open; pStrokes[numStrokes - 1]->state = PATH_Open;