Mesa (master): glx: Check malloc return value before accessing memory in glx/clientattrib.c
Carl Worth
cworth at kemper.freedesktop.org
Tue Dec 3 22:04:12 UTC 2013
Module: Mesa
Branch: master
Commit: b8875cb7c822ad366625a532dd9209d1647771af
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b8875cb7c822ad366625a532dd9209d1647771af
Author: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
Date: Mon Dec 2 02:39:00 2013 -0700
glx: Check malloc return value before accessing memory in glx/clientattrib.c
Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
---
src/glx/clientattrib.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/glx/clientattrib.c b/src/glx/clientattrib.c
index 1b306ea..37f14c5 100644
--- a/src/glx/clientattrib.c
+++ b/src/glx/clientattrib.c
@@ -76,6 +76,10 @@ __indirect_glPushClientAttrib(GLuint mask)
if (spp < &gc->attributes.stack[__GL_CLIENT_ATTRIB_STACK_DEPTH]) {
if (!(sp = *spp)) {
sp = malloc(sizeof(__GLXattribute));
+ if (sp == NULL) {
+ __glXSetError(gc, GL_OUT_OF_MEMORY);
+ return;
+ }
*spp = sp;
}
sp->mask = mask;
More information about the mesa-commit
mailing list