Mesa (master): zink: do not try to destroy NULL-fence

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Nov 29 09:19:23 UTC 2019


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

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Wed Nov 27 17:22:24 2019 +0100

zink: do not try to destroy NULL-fence

destroy_fence doesn't handle NULL-pointers gracefully. So let's avoid
hitting that code-path, by simply returning NULL early here instead.

CoverityID: 1455179
Reviewed-by: Dave Airlie <airlied at redhat.com>

---

 src/gallium/drivers/zink/zink_fence.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/zink/zink_fence.c b/src/gallium/drivers/zink/zink_fence.c
index ac761e667a3..72f1b6c5766 100644
--- a/src/gallium/drivers/zink/zink_fence.c
+++ b/src/gallium/drivers/zink/zink_fence.c
@@ -46,7 +46,7 @@ zink_create_fence(struct pipe_screen *pscreen)
    struct zink_fence *ret = CALLOC_STRUCT(zink_fence);
    if (!ret) {
       debug_printf("CALLOC_STRUCT failed\n");
-      goto fail;
+      return NULL;
    }
 
    if (vkCreateFence(screen->dev, &fci, NULL, &ret->fence) != VK_SUCCESS) {




More information about the mesa-commit mailing list