encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a potential double-free bug if glGenTextures() failed.

This commit is contained in:
Sam Lantinga 2013-10-03 20:42:43 -07:00
parent b39a4daf04
commit e5ef978e13
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/render/opengl/SDL_render_gl.c
View File

@ -639,8 +639,6 @@ GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
} }
} }
texture->driverdata = data;
if (texture->access == SDL_TEXTUREACCESS_TARGET) { if (texture->access == SDL_TEXTUREACCESS_TARGET) {
data->fbo = GL_GetFBO(renderdata, texture->w, texture->h); data->fbo = GL_GetFBO(renderdata, texture->w, texture->h);
} else { } else {
@ -653,6 +651,8 @@ GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
SDL_free(data); SDL_free(data);
return -1; return -1;
} }
texture->driverdata = data;
if ((renderdata->GL_ARB_texture_rectangle_supported) if ((renderdata->GL_ARB_texture_rectangle_supported)
/* && texture->access != SDL_TEXTUREACCESS_TARGET */){ /* && texture->access != SDL_TEXTUREACCESS_TARGET */){
data->type = GL_TEXTURE_RECTANGLE_ARB; data->type = GL_TEXTURE_RECTANGLE_ARB;
@ -804,6 +804,7 @@ GL_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
data->format, data->formattype, pixels); data->format, data->formattype, pixels);
} }
renderdata->glDisable(data->type); renderdata->glDisable(data->type);
return GL_CheckError("glTexSubImage2D()", renderer); return GL_CheckError("glTexSubImage2D()", renderer);
} }
@ -839,6 +840,7 @@ GL_UpdateTextureYUV(SDL_Renderer * renderer, SDL_Texture * texture,
rect->w/2, rect->h/2, rect->w/2, rect->h/2,
data->format, data->formattype, Vplane); data->format, data->formattype, Vplane);
renderdata->glDisable(data->type); renderdata->glDisable(data->type);
return GL_CheckError("glTexSubImage2D()", renderer); return GL_CheckError("glTexSubImage2D()", renderer);
} }
@ -1318,7 +1320,9 @@ GL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
data->glReadPixels(rect->x, (h-rect->y)-rect->h, rect->w, rect->h, data->glReadPixels(rect->x, (h-rect->y)-rect->h, rect->w, rect->h,
format, type, temp_pixels); format, type, temp_pixels);
GL_CheckError("", renderer); if (GL_CheckError("glReadPixels()", renderer) < 0) {
return -1;
}
/* Flip the rows to be top-down */ /* Flip the rows to be top-down */
length = rect->w * SDL_BYTESPERPIXEL(temp_format); length = rect->w * SDL_BYTESPERPIXEL(temp_format);