From: Vinson Lee <vlee@freedesktop.org>
Date: Tue, 22 Sep 2020 01:20:25 +0000 (-0700)
Subject: gallium/dri2: Move image->texture assignment after image NULL check.
X-Git-Tag: upstream/21.0.0~5069
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=03e7b75c22c0b3b55820be982ff9d98d704f3260;p=platform%2Fupstream%2Fmesa.git

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>
---

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 @@ dri2_map_image(__DRIcontext *context, __DRIimage *image,
    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 @@ dri2_map_image(__DRIcontext *context, __DRIimage *image,
    if (plane >= dri2_get_mapping_by_format(image->dri_format)->nplanes)
       return NULL;
 
+   struct pipe_resource *resource = image->texture;
    while (plane--)
       resource = resource->next;