Mesa (master): galahad: Prevent segfault when passing NULL to set_vertex_buffers.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Mon Nov 5 11:18:30 UTC 2012


Module: Mesa
Branch: master
Commit: 99c45c5aa4b60e1fd55ff4fde6ff6d1a391987d9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=99c45c5aa4b60e1fd55ff4fde6ff6d1a391987d9

Author: José Fonseca <jfonseca at vmware.com>
Date:   Mon Nov  5 11:05:34 2012 +0000

galahad: Prevent segfault when passing NULL to set_vertex_buffers.

State tracker now passes NULL buffer array to unbind buffers.

---

 src/gallium/drivers/galahad/glhd_context.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/galahad/glhd_context.c b/src/gallium/drivers/galahad/glhd_context.c
index ecdfe06..53e0b17 100644
--- a/src/gallium/drivers/galahad/glhd_context.c
+++ b/src/gallium/drivers/galahad/glhd_context.c
@@ -630,7 +630,7 @@ galahad_context_set_vertex_buffers(struct pipe_context *_pipe,
    struct pipe_vertex_buffer *buffers = NULL;
    unsigned i;
 
-   if (num_buffers) {
+   if (num_buffers && _buffers) {
       memcpy(unwrapped_buffers, _buffers, num_buffers * sizeof(*_buffers));
       for (i = 0; i < num_buffers; i++)
          unwrapped_buffers[i].buffer = galahad_resource_unwrap(_buffers[i].buffer);




More information about the mesa-commit mailing list