Mesa (master): vbo: add a null pointer check to handle OOM instead of crashing
Brian Paul
brianp at kemper.freedesktop.org
Fri Jan 25 22:48:26 UTC 2013
Module: Mesa
Branch: master
Commit: 7a89f08a22eb83ed2f0c51e516397d6415e64a3d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7a89f08a22eb83ed2f0c51e516397d6415e64a3d
Author: Brian Paul <brianp at vmware.com>
Date: Thu Jan 24 16:32:42 2013 -0700
vbo: add a null pointer check to handle OOM instead of crashing
Note: This is a candidate for the 9.0 branch.
---
src/mesa/vbo/vbo_exec_api.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index 985f220..353f8cf 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -124,6 +124,11 @@ void vbo_exec_vtx_wrap( struct vbo_exec_context *exec )
*/
vbo_exec_wrap_buffers( exec );
+ if (!exec->vtx.buffer_ptr) {
+ /* probably ran out of memory earlier when allocating the VBO */
+ return;
+ }
+
/* Copy stored stored vertices to start of new list.
*/
assert(exec->vtx.max_vert - exec->vtx.vert_count > exec->vtx.copied.nr);
More information about the mesa-commit
mailing list