Mesa (main): dri2: Fix Null pointer dereferences

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 71e748ad2443c373bb090fa1da2626da367b1d20
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=71e748ad2443c373bb090fa1da2626da367b1d20

Author: Sergii Melikhov <sergii.v.melikhov at globallogic.com>
Date:   Wed Aug 25 15:13:21 2021 +0300

dri2: Fix Null pointer dereferences

Fix defect reported by Coverity Scan CID-1490794

Fixes: 0d42033b26 ("glx/dri2: Require the driver to support v4 of __DRI_DRI2")
Signed-off-by: Sergii Melikhov <sergii.v.melikhov at globallogic.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12563>

---

 src/glx/dri2_glx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index 2c14ccec3f3..fbbfe1f6d57 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -1199,7 +1199,7 @@ dri2CreateScreen(int screen, struct glx_display * priv)
 	 psc->dri2 = (__DRIdri2Extension *) extensions[i];
    }
 
-   if (psc->core == NULL || psc->dri2 || psc->dri2->base.version < 3) {
+   if (psc->core == NULL || psc->dri2 == NULL || psc->dri2->base.version < 3) {
       ErrorMessageF("core dri or dri2 extension not found\n");
       goto handle_error;
    }