From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 30 May 2008 14:53:42 +0000 (-0600)
Subject: Fix segfault in _save_OBE_DrawElements() when using VBO and display list (bug 16156)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=df7d1ee2a5270be2d329fd0614a608357917bb74;p=mesa.git

Fix segfault in _save_OBE_DrawElements() when using VBO and display list (bug 16156)

This was previously fixed in master by commit 982dcb74fd19b88208d127b8019e2a2af979cac2 by Haihao Xiang.
---

diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index aded7381436..f62be5c14cf 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -864,6 +864,9 @@ static void GLAPIENTRY _save_OBE_DrawElements(GLenum mode, GLsizei count, GLenum
 
    _ae_map_vbos( ctx );
 
+   if (ctx->Array.ElementArrayBufferObj->Name)
+      indices = ADD_POINTERS(ctx->Array.ElementArrayBufferObj->Pointer, indices);
+
    vbo_save_NotifyBegin( ctx, mode | VBO_SAVE_PRIM_WEAK );
 
    switch (type) {