Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-20 22:16:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some possible malloc(0) calls reported by static analysis.

Browse Source
This commit is contained in:
Ryan C. Gordon 2018-06-24 12:16:58 -04:00
parent 88dfa46644
commit 5308a245a4
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/render/opengles2/SDL_render_gles2.c
View File

@ -719,6 +719,10 @@ GLES2_TexSubImage2D(GLES2_DriverContext *data, GLenum target, GLint xoffset, GLi
int src_pitch; int src_pitch;
int y; int y;
if ((width == 0) || (height == 0) || (bpp == 0)) {
return; /* nothing to do */
}
/* Reformat the texture data into a tightly packed array */ /* Reformat the texture data into a tightly packed array */
src_pitch = width * bpp; src_pitch = width * bpp;
src = (Uint8 *)pixels; src = (Uint8 *)pixels;
@ -1928,6 +1932,7 @@ GLES2_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
{ {
GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata; GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
Uint32 temp_format = renderer->target ? renderer->target->format : SDL_PIXELFORMAT_ABGR8888; Uint32 temp_format = renderer->target ? renderer->target->format : SDL_PIXELFORMAT_ABGR8888;
size_t buflen;
void *temp_pixels; void *temp_pixels;
int temp_pitch; int temp_pitch;
Uint8 *src, *dst, *tmp; Uint8 *src, *dst, *tmp;
@ -1937,7 +1942,12 @@ GLES2_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
GLES2_ActivateRenderer(renderer); GLES2_ActivateRenderer(renderer);
temp_pitch = rect->w * SDL_BYTESPERPIXEL(temp_format); temp_pitch = rect->w * SDL_BYTESPERPIXEL(temp_format);
temp_pixels = SDL_malloc(rect->h * temp_pitch); buflen = (size_t) (rect->h * temp_pitch);
if (buflen == 0) {
return 0; /* nothing to do. */
}
temp_pixels = SDL_malloc(buflen);
if (!temp_pixels) { if (!temp_pixels) {
return SDL_OutOfMemory(); return SDL_OutOfMemory();
} }