pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed crash in testpalette and potential crash in SDL_LoadBMP_RW()

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403312
This commit is contained in:
Sam Lantinga 2008-12-07 22:25:16 +00:00
parent a1b17450ce
commit 45899bac10
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/video/SDL_bmp.c
View file

@ -218,6 +218,20 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
if (biClrUsed == 0) { if (biClrUsed == 0) {
biClrUsed = 1 << biBitCount; biClrUsed = 1 << biBitCount;
} }
if (biClrUsed > palette->ncolors) {
palette->ncolors = biClrUsed;
palette->colors =
(SDL_Color *) SDL_realloc(palette->colors,
palette->ncolors *
sizeof(*palette->colors));
if (!palette->colors) {
SDL_OutOfMemory();
was_error = 1;
goto done;
}
} else if (biClrUsed < palette->ncolors) {
palette->ncolors = biClrUsed;
}
if (biSize == 12) { if (biSize == 12) {
for (i = 0; i < (int) biClrUsed; ++i) { for (i = 0; i < (int) biClrUsed; ++i) {
SDL_RWread(src, &palette->colors[i].b, 1, 1); SDL_RWread(src, &palette->colors[i].b, 1, 1);

2
test/testpalette.c
View file

@ -189,6 +189,8 @@ main(int argc, char **argv)
SDL_SetColorKey(boat[0], SDL_SRCCOLORKEY | SDL_RLEACCEL, SDL_SetColorKey(boat[0], SDL_SRCCOLORKEY | SDL_RLEACCEL,
SDL_MapRGB(boat[0]->format, 0xff, 0x00, 0xff)); SDL_MapRGB(boat[0]->format, 0xff, 0x00, 0xff));
boatcols = boat[0]->format->palette->ncolors; boatcols = boat[0]->format->palette->ncolors;
if (boatcols >= 256)
sdlerr("too many colors in sail.bmp");
boat[1] = hflip(boat[0]); boat[1] = hflip(boat[0]);
SDL_SetColorKey(boat[1], SDL_SRCCOLORKEY | SDL_RLEACCEL, SDL_SetColorKey(boat[1], SDL_SRCCOLORKEY | SDL_RLEACCEL,
SDL_MapRGB(boat[1]->format, 0xff, 0x00, 0xff)); SDL_MapRGB(boat[1]->format, 0xff, 0x00, 0xff));