diff options
| author | Brian Paul <brianp@vmware.com> | 2013-03-06 12:08:17 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2013-03-07 06:28:23 -0700 |
| commit | c2665aacdd14beec9580246736c602e3ff04d7ae (patch) | |
| tree | fbaeb53445eba723d4f93ef04a8a04afcbd9cd41 | |
| parent | 5984a911f9dda3f7421bdec604d30d0dfe2cea5e (diff) | |
vbo: fix crash found with shared display lists
This fixes a crash when a display list is created in one context
but executed from a second one. The vbo_save_context::vertex_store
memeber will be NULL if we never created a display list with the
context. Just check for that before dereferencing the pointer.
Fixes http://bugzilla.redhat.com/show_bug.cgi?id=918661
Note: This is a candidate for the stable branches.
| -rw-r--r-- | src/mesa/vbo/vbo_save_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c index efb386e5c9..f5b5c411d4 100644 --- a/src/mesa/vbo/vbo_save_draw.c +++ b/src/mesa/vbo/vbo_save_draw.c @@ -253,7 +253,7 @@ vbo_save_playback_vertex_list(struct gl_context *ctx, void *data) struct vbo_save_context *save = &vbo_context(ctx)->save; GLboolean remap_vertex_store = GL_FALSE; - if (save->vertex_store->buffer) { + if (save->vertex_store && save->vertex_store->buffer) { /* The vertex store is currently mapped but we're about to replay * a display list. This can happen when a nested display list is * being build with GL_COMPILE_AND_EXECUTE. |