mirror of
https://github.com/reactos/wine.git
synced 2024-11-29 22:50:43 +00:00
Fix array index crash in buidling GDI palette from logical palette.
This commit is contained in:
parent
44cb0906da
commit
f3c99197ac
@ -418,18 +418,24 @@ static RGBQUAD *X11DRV_DIB_BuildColorTable( X11DRV_PDEVICE *physDev, WORD coloru
|
||||
else
|
||||
{
|
||||
HPALETTE hpal = GetCurrentObject(physDev->hdc, OBJ_PAL);
|
||||
PALETTEENTRY pal_ents[256];
|
||||
PALETTEENTRY * pal_ents;
|
||||
WORD *index = (WORD*) ((LPBYTE) info + (WORD) info->bmiHeader.biSize);
|
||||
int logcolors, entry;
|
||||
|
||||
GetPaletteEntries(hpal, 0, 256, pal_ents);
|
||||
logcolors = GetPaletteEntries( hpal, 0, 0, NULL );
|
||||
pal_ents = HeapAlloc(GetProcessHeap(), 0, logcolors * sizeof(*pal_ents));
|
||||
logcolors = GetPaletteEntries( hpal, 0, logcolors, pal_ents );
|
||||
|
||||
for(i = 0; i < colors; i++, index++)
|
||||
{
|
||||
colorTable[i].rgbRed = pal_ents[*index].peRed;
|
||||
colorTable[i].rgbGreen = pal_ents[*index].peGreen;
|
||||
colorTable[i].rgbBlue = pal_ents[*index].peBlue;
|
||||
entry = *index % logcolors;
|
||||
colorTable[i].rgbRed = pal_ents[entry].peRed;
|
||||
colorTable[i].rgbGreen = pal_ents[entry].peGreen;
|
||||
colorTable[i].rgbBlue = pal_ents[entry].peBlue;
|
||||
colorTable[i].rgbReserved = 0;
|
||||
}
|
||||
|
||||
HeapFree(GetProcessHeap(), 0, pal_ents);
|
||||
}
|
||||
return colorTable;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user