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

Don't allocate memory if we're just going to fail when checking parameters.

Browse source
This commit is contained in:
Ryan C. Gordon 2013-07-20 21:19:20 -04:00
parent 51ba788d0d
commit 20b4bd0c6a
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/render/SDL_yuv_sw.c
View file

@ -1029,12 +1029,6 @@ SDL_SW_CreateYUVTexture(Uint32 format, int w, int h)
int i; int i;
int CR, CB; int CR, CB;
swdata = (SDL_SW_YUVTexture *) SDL_calloc(1, sizeof(*swdata));
if (!swdata) {
SDL_OutOfMemory();
return NULL;
}
switch (format) { switch (format) {
case SDL_PIXELFORMAT_YV12: case SDL_PIXELFORMAT_YV12:
case SDL_PIXELFORMAT_IYUV: case SDL_PIXELFORMAT_IYUV:
@ -1043,11 +1037,16 @@ SDL_SW_CreateYUVTexture(Uint32 format, int w, int h)
case SDL_PIXELFORMAT_YVYU: case SDL_PIXELFORMAT_YVYU:
break; break;
default: default:
SDL_SW_DestroyYUVTexture(swdata);
SDL_SetError("Unsupported YUV format"); SDL_SetError("Unsupported YUV format");
return NULL; return NULL;
} }
swdata = (SDL_SW_YUVTexture *) SDL_calloc(1, sizeof(*swdata));
if (!swdata) {
SDL_OutOfMemory();
return NULL;
}
swdata->format = format; swdata->format = format;
swdata->target_format = SDL_PIXELFORMAT_UNKNOWN; swdata->target_format = SDL_PIXELFORMAT_UNKNOWN;
swdata->w = w; swdata->w = w;
@ -1095,7 +1094,7 @@ SDL_SW_CreateYUVTexture(Uint32 format, int w, int h)
swdata->planes[0] = swdata->pixels; swdata->planes[0] = swdata->pixels;
break; break;
default: default:
/* We should never get here (caught above) */ SDL_assert(0 && "We should never get here (caught above)");
break; break;
} }