ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-02-02 06:01:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

video: Detect and reject nonsense SDL_surface dimensions

Browse source 
Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2022-05-10 10:34:41 +01:00 committed by Sam Lantinga
parent 8c9f7104e3
commit 535fdc3adc
1 changed files with 63 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
src/video/SDL_surface.c
View file

@ -42,7 +42,7 @@ SDL_COMPILE_TIME_ASSERT(can_indicate_overflow, SDL_SIZE_MAX > SDL_MAX_SINT32);
* Return SDL_SIZE_MAX on overflow. * Return SDL_SIZE_MAX on overflow.
*/ */
static size_t static size_t
SDL_CalculatePitch(Uint32 format, size_t width) SDL_CalculatePitch(Uint32 format, size_t width, SDL_bool minimal)
{ {
size_t pitch; size_t pitch;
@ -59,11 +59,13 @@ SDL_CalculatePitch(Uint32 format, size_t width)
} }
pitch /= 8; pitch /= 8;
} }
/* 4-byte aligning for speed */ if (!minimal) {
if (SDL_size_add_overflow(pitch, 3, &pitch)) { /* 4-byte aligning for speed */
return SDL_SIZE_MAX; if (SDL_size_add_overflow(pitch, 3, &pitch)) {
return SDL_SIZE_MAX;
}
pitch &= ~3;
} }
pitch &= ~3;
return pitch; return pitch;
} }
@ -81,7 +83,17 @@ SDL_CreateRGBSurfaceWithFormat(Uint32 flags, int width, int height, int depth,
/* The flags are no longer used, make the compiler happy */ /* The flags are no longer used, make the compiler happy */
(void)flags; (void)flags;
pitch = SDL_CalculatePitch(format, width); if (width < 0) {
SDL_InvalidParamError("width");
return NULL;
}
if (height < 0) {
SDL_InvalidParamError("height");
return NULL;
}
pitch = SDL_CalculatePitch(format, width, SDL_FALSE);
if (pitch > SDL_MAX_SINT32) { if (pitch > SDL_MAX_SINT32) {
/* Overflow... */ /* Overflow... */
SDL_OutOfMemory(); SDL_OutOfMemory();
@ -194,8 +206,34 @@ SDL_CreateRGBSurfaceFrom(void *pixels,
Uint32 Amask) Uint32 Amask)
{ {
SDL_Surface *surface; SDL_Surface *surface;
Uint32 format;
size_t minimalPitch;
surface = SDL_CreateRGBSurface(0, 0, 0, depth, Rmask, Gmask, Bmask, Amask); if (width < 0) {
SDL_InvalidParamError("width");
return NULL;
}
if (height < 0) {
SDL_InvalidParamError("height");
return NULL;
}
format = SDL_MasksToPixelFormatEnum(depth, Rmask, Gmask, Bmask, Amask);
if (format == SDL_PIXELFORMAT_UNKNOWN) {
SDL_SetError("Unknown pixel format");
return NULL;
}
minimalPitch = SDL_CalculatePitch(format, width, SDL_TRUE);
if (pitch < 0 || ((size_t) pitch) < minimalPitch) {
SDL_InvalidParamError("pitch");
return NULL;
}
surface = SDL_CreateRGBSurfaceWithFormat(0, 0, 0, depth, format);
if (surface != NULL) { if (surface != NULL) {
surface->flags |= SDL_PREALLOC; surface->flags |= SDL_PREALLOC;
surface->pixels = pixels; surface->pixels = pixels;
@ -217,6 +255,24 @@ SDL_CreateRGBSurfaceWithFormatFrom(void *pixels,
Uint32 format) Uint32 format)
{ {
SDL_Surface *surface; SDL_Surface *surface;
size_t minimalPitch;
if (width < 0) {
SDL_InvalidParamError("width");
return NULL;
}
if (height < 0) {
SDL_InvalidParamError("height");
return NULL;
}
minimalPitch = SDL_CalculatePitch(format, width, SDL_TRUE);
if (pitch < 0 || ((size_t) pitch) < minimalPitch) {
SDL_InvalidParamError("pitch");
return NULL;
}
surface = SDL_CreateRGBSurfaceWithFormat(0, 0, 0, depth, format); surface = SDL_CreateRGBSurfaceWithFormat(0, 0, 0, depth, format);
if (surface != NULL) { if (surface != NULL) {