OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: ad609bf55a ("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>
This commit is contained in:
Vinson Lee
2020-09-21 18:20:25 -07:00
committed by Marge Bot
parent 4bd0df0e4a
commit 03e7b75c22
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/frontends/dri/dri2.c
View File

@@ -1559,7 +1559,6 @@ dri2_map_image(__DRIcontext *context, __DRIimage *image,
struct dri_context *ctx = dri_context(context); struct dri_context *ctx = dri_context(context);
struct pipe_context *pipe = ctx->st->pipe; struct pipe_context *pipe = ctx->st->pipe;
enum pipe_map_flags pipe_access = 0; enum pipe_map_flags pipe_access = 0;
struct pipe_resource *resource = image->texture;
struct pipe_transfer *trans; struct pipe_transfer *trans;
void *map; void *map;
@@ -1570,6 +1569,7 @@ dri2_map_image(__DRIcontext *context, __DRIimage *image,
if (plane >= dri2_get_mapping_by_format(image->dri_format)->nplanes) if (plane >= dri2_get_mapping_by_format(image->dri_format)->nplanes)
return NULL; return NULL;
struct pipe_resource *resource = image->texture;
while (plane--) while (plane--)
resource = resource->next; resource = resource->next;