Mesa (master): virgl: return error if allocating resolve_tmp fails

[GitLab Mirror]

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

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Thu Apr  4 12:36:08 2019 +0200

virgl: return error if allocating resolve_tmp fails

Signed-off-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Reviewed-by: Gurchetan Singh <gurchetansingh at chromium.org>

---

 src/gallium/drivers/virgl/virgl_texture.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gallium/drivers/virgl/virgl_texture.c b/src/gallium/drivers/virgl/virgl_texture.c
index d52062579d4..398d2ef9d4e 100644
--- a/src/gallium/drivers/virgl/virgl_texture.c
+++ b/src/gallium/drivers/virgl/virgl_texture.c
@@ -135,6 +135,10 @@ static void *virgl_texture_transfer_map(struct pipe_context *ctx,
       virgl_init_temp_resource_from_box(&templ, resource, box, level, 0);
 
       trans->resolve_tmp = (struct virgl_resource *)ctx->screen->resource_create(ctx->screen, &templ);
+      if (!trans->resolve_tmp) {
+         virgl_resource_destroy_transfer(&vctx->transfer_pool, trans);
+         return NULL;
+      }
 
       virgl_copy_region_with_blit(ctx, &trans->resolve_tmp->u.b, 0, 0, 0, 0, resource, level, box);
       ctx->flush(ctx, NULL, 0);