From 28c5ca4588055838a460c544fe98794c43f0ddbd Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Wed, 28 Oct 2020 19:47:42 -0700 Subject: [PATCH] frontends/va: Fix *num_entrypoints check. Fix defect reported by Coverity Scan. Dereference before null check (REVERSE_INULL) check_after_deref: Null-checking num_entrypoints suggests that it may be null, but it has already been dereferenced on all paths leading to the check. Fixes: 5bcaa1b9e970 ("st/va: add encode entrypoint v2") Signed-off-by: Vinson Lee Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: (cherry picked from commit 7820c8c13ff3e9367b208f09059c940a1629f708) --- .pick_status.json | 2 +- src/gallium/frontends/va/config.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 9762ee70e4e..c461ebbbbd7 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1795,7 +1795,7 @@ "description": "frontends/va: Fix *num_entrypoints check.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "5bcaa1b9e9707aea7be73b406345bb9e46f92a18" }, diff --git a/src/gallium/frontends/va/config.c b/src/gallium/frontends/va/config.c index 294cbcc6418..5402a834bb1 100644 --- a/src/gallium/frontends/va/config.c +++ b/src/gallium/frontends/va/config.c @@ -99,7 +99,7 @@ vlVaQueryConfigEntrypoints(VADriverContextP ctx, VAProfile profile, PIPE_VIDEO_CAP_SUPPORTED)) entrypoint_list[(*num_entrypoints)++] = VAEntrypointEncSlice; - if (num_entrypoints == 0) + if (*num_entrypoints == 0) return VA_STATUS_ERROR_UNSUPPORTED_PROFILE; assert(*num_entrypoints <= ctx->max_entrypoints);