From d0836eda5e7d8e9093c1975ef545e3b3deb287a1 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 14 Nov 2011 08:27:13 -0700 Subject: [PATCH] st/mesa: check for missing VBO in setup_interleaved_attribs() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This fixes a crash with the piglit vbo-too-small test. Reviewed-by: José Fonseca --- src/mesa/state_tracker/st_draw.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c index f2fbf483694..cb518e1afb3 100644 --- a/src/mesa/state_tracker/st_draw.c +++ b/src/mesa/state_tracker/st_draw.c @@ -436,8 +436,8 @@ setup_interleaved_attribs(struct gl_context *ctx, /* all interleaved arrays in a VBO */ struct st_buffer_object *stobj = st_buffer_object(bufobj); - if (!stobj) { - /* probably out of memory */ + if (!stobj || !stobj->buffer) { + /* probably out of memory (or zero-sized buffer) */ return GL_FALSE; } @@ -505,7 +505,7 @@ setup_non_interleaved_attribs(struct gl_context *ctx, struct st_buffer_object *stobj = st_buffer_object(bufobj); if (!stobj || !stobj->buffer) { - /* probably ran out of memory */ + /* probably out of memory (or zero-sized buffer) */ return GL_FALSE; } -- 2.30.2