Mesa (staging/19.1): egl: check for NULL value like eglGetSyncAttribKHR does

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Sep 23 08:56:02 UTC 2019


Module: Mesa
Branch: staging/19.1
Commit: a6d1035fb0251aac9e61aff83ed9716dd74411fd
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a6d1035fb0251aac9e61aff83ed9716dd74411fd

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Mon Jun 10 13:06:05 2019 +0300

egl: check for NULL value like eglGetSyncAttribKHR does

Commit d1e1563bb63 added a NULL check for eglGetSyncAttribKHR
but eglGetSyncAttrib does not do this. Patch adds same check to
happen with eglGetSyncAttrib.

Fixes crashes in (when exposing EGL 1.5):
   dEQP-EGL.functional.fence_sync.invalid.get_invalid_value

Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit 99cbec0a5f463fef4d9c61f34482d9eb00293704)

---

 src/egl/main/eglapi.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 85d94e8f6dc..a540bff79df 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -2064,6 +2064,10 @@ eglGetSyncAttrib(EGLDisplay dpy, EGLSync sync, EGLint attribute, EGLAttrib *valu
    _EGLDisplay *disp = _eglLockDisplay(dpy);
    _EGLSync *s = _eglLookupSync(sync, disp);
    _EGL_FUNC_START(disp, EGL_OBJECT_SYNC_KHR, s, EGL_FALSE);
+
+   if (!value)
+      RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
+
    return _eglGetSyncAttribCommon(disp, s, attribute, value);
 }
 




More information about the mesa-commit mailing list