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

Fixed memory corruption with invalid pixel values.

Browse source
This commit is contained in:
Sam Lantinga 2011-03-06 23:56:23 -08:00
parent b2ad2a405c
commit 2d5640cc96
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/video/SDL_pixels.c
View file

@ -768,9 +768,13 @@ SDL_GetRGB(Uint32 pixel, const SDL_PixelFormat * format, Uint8 * r, Uint8 * g,
v = (pixel & format->Bmask) >> format->Bshift; v = (pixel & format->Bmask) >> format->Bshift;
*b = (v << format->Bloss) + (v >> (8 - (format->Bloss << 1))); *b = (v << format->Bloss) + (v >> (8 - (format->Bloss << 1)));
} else { } else {
*r = format->palette->colors[pixel].r; if (pixel < format->palette->ncolors) {
*g = format->palette->colors[pixel].g; *r = format->palette->colors[pixel].r;
*b = format->palette->colors[pixel].b; *g = format->palette->colors[pixel].g;
*b = format->palette->colors[pixel].b;
} else {
*r = *g = *b = 0;
}
} }
} }
@ -802,10 +806,14 @@ SDL_GetRGBA(Uint32 pixel, const SDL_PixelFormat * format,
*a = SDL_ALPHA_OPAQUE; *a = SDL_ALPHA_OPAQUE;
} }
} else { } else {
*r = format->palette->colors[pixel].r; if (pixel < format->palette->ncolors) {
*g = format->palette->colors[pixel].g; *r = format->palette->colors[pixel].r;
*b = format->palette->colors[pixel].b; *g = format->palette->colors[pixel].g;
*a = SDL_ALPHA_OPAQUE; *b = format->palette->colors[pixel].b;
*a = SDL_ALPHA_OPAQUE;
} else {
*r = *g = *b = *a = 0;
}
} }
} }