From: Jerome Glisse <jglisse@redhat.com>
Date: Tue, 21 Dec 2010 15:49:53 +0000 (-0500)
Subject: r600g: avoid segfault
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fa62cf7450595b3d99259b5a212df301ca711d4b;p=mesa.git

r600g: avoid segfault

Candidates 7.10

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
---

diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index af19beb6f3c..8a69a10fc80 100644
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -1334,7 +1334,7 @@ void evergreen_vertex_buffer_update(struct r600_pipe_context *rctx)
 			rbuffer = (struct r600_resource*)vertex_buffer->buffer;
 			offset = 0;
 		}
-		if (vertex_buffer == NULL)
+		if (vertex_buffer == NULL || rbuffer == NULL)
 			continue;
 		offset += vertex_buffer->buffer_offset + r600_bo_offset(rbuffer->bo);
 
diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index 0d76afd6cd5..9b099df18d4 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -174,7 +174,7 @@ void r600_vertex_buffer_update(struct r600_pipe_context *rctx)
 			rbuffer = (struct r600_resource*)vertex_buffer->buffer;
 			offset = 0;
 		}
-		if (vertex_buffer == NULL)
+		if (vertex_buffer == NULL || rbuffer == NULL)
 			continue;
 		offset += vertex_buffer->buffer_offset + r600_bo_offset(rbuffer->bo);