commit 03e7b75c22c0b3b55820be982ff9d98d704f3260
author Vinson Lee <vlee@freedesktop.org> Mon Sep 21 18:20:25 2020 -0700
committer Marge Bot <eric+marge@anholt.net> Fri Sep 25 00:47:26 2020 +0000
tree 26da8b74a59c1af58aca1ab48f310f4cd02f579e
parent 4bd0df0e4a8cd600c17a01b3bf297b0d06cb6e44

gallium/dri2: Move image->texture assignment after image NULL check.

Fix defect reported by Coverity Scan.

Dereference before null check (REVERSE_INULL)
check_after_deref: Null-checking image suggests that it may be
null, but it has already been dereferenced on all paths leading to
the check.

Fixes: ad609bf55a87 ("frontend/dri: Implement mapping individual planes.")
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6807>

src/gallium/frontends/dri/dri2.c

diff --git a/src/gallium/frontends/dri/dri2.c b/src/gallium/frontends/dri/dri2.c
index fa5009c..aab9c8c 100644
--- a/src/gallium/frontends/dri/dri2.c
+++ b/src/gallium/frontends/dri/dri2.c
@@ -1559,7 +1559,6 @@
    struct dri_context *ctx = dri_context(context);
    struct pipe_context *pipe = ctx->st->pipe;
    enum pipe_map_flags pipe_access = 0;
-   struct pipe_resource *resource = image->texture;
    struct pipe_transfer *trans;
    void *map;
 
@@ -1570,6 +1569,7 @@
    if (plane >= dri2_get_mapping_by_format(image->dri_format)->nplanes)
       return NULL;
 
+   struct pipe_resource *resource = image->texture;
    while (plane--)
       resource = resource->next;