diff options
| author | Stéphane Marchesin <marcheu@chromium.org> | 2013-01-28 15:04:00 -0800 |
|---|---|---|
| committer | Stéphane Marchesin <marcheu@chromium.org> | 2013-01-29 11:15:22 -0800 |
| commit | 67e7263e4567f36e59009a1ca076a2854a6c1b0e (patch) | |
| tree | 5d267ce47a45c72ad9f4bcf18fbdeeeb18680043 /src/glx/dri2_glx.c | |
| parent | 70c5297439cc5401045ec842a6abeda118296f69 (diff) | |
| download | mesa-67e7263e4567f36e59009a1ca076a2854a6c1b0e.tar.gz | |
glx: Check that swap_buffers_reply is non-NULL before using it
Check that the return value from xcb_dri2_swap_buffers_reply is
non-NULL before accessing the struct members.
Note: This is a candidate for the 9.0 branch.
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/glx/dri2_glx.c')
| -rw-r--r-- | src/glx/dri2_glx.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index a51716fedb9..78a2a42ddab 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; } |