On 01/28/2013 04:11 PM, Stéphane Marchesin wrote:
Check that the return value from xcb_dri2_swap_buffers_reply is non-NULL before accessing the struct members. --- src/glx/dri2_glx.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index a51716f..78a2a42 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -789,9 +789,11 @@ dri2XcbSwapBuffers(Display *dpy, swap_buffers_reply = xcb_dri2_swap_buffers_reply(c, swap_buffers_cookie, NULL); - ret = merge_counter(swap_buffers_reply->swap_hi, - swap_buffers_reply->swap_lo); - free(swap_buffers_reply); + if (swap_buffers_reply) { + ret = merge_counter(swap_buffers_reply->swap_hi, + swap_buffers_reply->swap_lo); + free(swap_buffers_reply); + } return ret; }
Maybe also tag this as a candidate for the 9.0 branch. Reviewed-by: Brian Paul <bri...@vmware.com> _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
