summaryrefslogtreecommitdiffstats
path: root/src/mapi/glapi
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2016-03-24 13:57:58 -0400
committerAdam Jackson <ajax@redhat.com>2016-03-29 10:10:57 -0400
commitea0f62e45eab39a8957f933325a1e16ace5c9e8c (patch)
tree5d17d196fe145e5c93e29693be1c22acfa0286c3 /src/mapi/glapi
parentdcd41ca87a06199184eb8ada654aec985185189c (diff)
downloadexternal_mesa3d-ea0f62e45eab39a8957f933325a1e16ace5c9e8c.zip
external_mesa3d-ea0f62e45eab39a8957f933325a1e16ace5c9e8c.tar.gz
external_mesa3d-ea0f62e45eab39a8957f933325a1e16ace5c9e8c.tar.bz2
glapi/glx: Sync some additional error checking from xserver
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'src/mapi/glapi')
-rw-r--r--src/mapi/glapi/gen/glX_proto_recv.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mapi/glapi/gen/glX_proto_recv.py b/src/mapi/glapi/gen/glX_proto_recv.py
index 1cfa8c5..cf5b59c 100644
--- a/src/mapi/glapi/gen/glX_proto_recv.py
+++ b/src/mapi/glapi/gen/glX_proto_recv.py
@@ -437,6 +437,10 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto):
print ' %s %s = __glXGetAnswerBuffer(cl, %s%s, answerBuffer, sizeof(answerBuffer), %u);' % (param.type_string(), param.name, param.counter, size_scale, type_size)
answer_string = param.name
answer_count = param.counter
+ print ''
+ print ' if (%s == NULL) return BadAlloc;' % (param.name)
+ print ' __glXClearErrorOccured();'
+ print ''
elif c >= 1:
print ' %s %s[%u];' % (answer_type, param.name, c)
answer_string = param.name