From 7a89f08a22eb83ed2f0c51e516397d6415e64a3d Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 24 Jan 2013 16:32:42 -0700 Subject: [PATCH] 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 file changed, 5 insertions(+) diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index 985f2209c10..353f8cfde34 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); -- 2.30.2