[Mesa-dev] [PATCH 1/4] r600_state_common: check NULL return from u_upload_alloc

Julien Isorce julien.isorce at gmail.com
Fri Mar 24 11:08:10 UTC 2017


Like done in si_state_draw.c::si_draw_vbo

Signed-off-by: Julien Isorce <jisorce at oblong.com>
---
 src/gallium/drivers/r600/r600_state_common.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
index 6f8279f..cedeb74 100644
--- a/src/gallium/drivers/r600/r600_state_common.c
+++ b/src/gallium/drivers/r600/r600_state_common.c
@@ -1746,6 +1746,10 @@ static void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info
 
 			u_upload_alloc(ctx->stream_uploader, start, count * 2,
                                        256, &out_offset, &out_buffer, &ptr);
+			if (unlikely(!ptr)) {
+				pipe_resource_reference(&ib.buffer, NULL);
+				return;
+			}
 
 			util_shorten_ubyte_elts_to_userptr(
 						&rctx->b.b, &ib, 0, 0, ib.offset + start, count, ptr);
-- 
2.7.4



More information about the mesa-dev mailing list