projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
457d40e
)
mesa/main: In _mesa_CompressedTextureSubImage3D() check found texObj
author
Juha-Pekka Heikkila
<juhapekka.heikkila@gmail.com>
Mon, 12 Jan 2015 13:27:24 +0000
(15:27 +0200)
committer
Jason Ekstrand
<jason.ekstrand@intel.com>
Mon, 12 Jan 2015 17:56:43 +0000
(09:56 -0800)
Check returned texObj is not null. If texObj is null there is already
GL_INVALID_OPERATION error set.
Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
src/mesa/main/teximage.c
patch
|
blob
|
history
diff --git
a/src/mesa/main/teximage.c
b/src/mesa/main/teximage.c
index 4fa7f0fcaf69a24fbf3270d2db7019ee7924b58d..5ada94f1ffd1d3625f935d373933ab4f6c1a94a0 100644
(file)
--- a/
src/mesa/main/teximage.c
+++ b/
src/mesa/main/teximage.c
@@
-4732,6
+4732,8
@@
_mesa_CompressedTextureSubImage3D(GLuint texture, GLint level, GLint xoffset,
texObj = _mesa_lookup_texture_err(ctx, texture,
"glCompressedTextureSubImage3D");
+ if (!texObj)
+ return;
_mesa_compressed_texture_sub_image(ctx, 3, texObj, texObj->Target, level,
xoffset, yoffset, zoffset,