projects
/
platform
/
upstream
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1254a2b
)
mesa: add null ptr checks in GetTexParameterI[u]iv() functions
author
Brian Paul
<brianp@vmware.com>
Thu, 4 Aug 2011 14:22:31 +0000
(08:22 -0600)
committer
Brian Paul
<brianp@vmware.com>
Thu, 4 Aug 2011 14:22:31 +0000
(08:22 -0600)
src/mesa/main/texparam.c
patch
|
blob
|
history
diff --git
a/src/mesa/main/texparam.c
b/src/mesa/main/texparam.c
index
0dec017
..
97d0359
100644
(file)
--- a/
src/mesa/main/texparam.c
+++ b/
src/mesa/main/texparam.c
@@
-1379,6
+1379,8
@@
_mesa_GetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
ASSERT_OUTSIDE_BEGIN_END(ctx);
texObj = get_texobj(ctx, target, GL_TRUE);
+ if (!texObj)
+ return;
switch (pname) {
case GL_TEXTURE_BORDER_COLOR:
@@
-1399,6
+1401,8
@@
_mesa_GetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
ASSERT_OUTSIDE_BEGIN_END(ctx);
texObj = get_texobj(ctx, target, GL_TRUE);
+ if (!texObj)
+ return;
switch (pname) {
case GL_TEXTURE_BORDER_COLOR: