From: Zack Rusin <zack@kde.org>
Date: Tue, 8 Jun 2010 20:18:38 +0000 (-0400)
Subject: softpipe: make sure that invalid calls to sosettargets don't crash us
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=38b13459be46bb6d243365d93d4e44ccfa370d69;p=mesa.git

softpipe: make sure that invalid calls to sosettargets don't crash us
---

diff --git a/src/gallium/drivers/softpipe/sp_state_so.c b/src/gallium/drivers/softpipe/sp_state_so.c
index 8bd20cd2aca..27acd3dfc12 100644
--- a/src/gallium/drivers/softpipe/sp_state_so.c
+++ b/src/gallium/drivers/softpipe/sp_state_so.c
@@ -96,6 +96,13 @@ softpipe_set_stream_output_buffers(struct pipe_context *pipe,
       void *mapped;
       struct softpipe_resource *res = softpipe_resource(buffers[i]);
 
+      if (!res) {
+         /* the whole call is invalid, bail out */
+         softpipe->so_target.num_buffers = 0;
+         draw_set_mapped_so_buffers(softpipe->draw, map_buffers, 0);
+         return;
+      }
+
       softpipe->so_target.buffer[i] = res;
       softpipe->so_target.offset[i] = offsets[i];
       softpipe->so_target.so_count[i] = 0;