Mesa (master): egl: Fix missing unlock in eglGetSyncAttribKHR

Chad Versace chadversary at kemper.freedesktop.org
Tue Oct 4 21:12:56 UTC 2016


Module: Mesa
Branch: master
Commit: 17084b6f9340f798111e53e08f5d35c7630cee48
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=17084b6f9340f798111e53e08f5d35c7630cee48

Author: Chad Versace <chadversary at chromium.org>
Date:   Tue Sep 27 23:06:37 2016 -0700

egl: Fix missing unlock in eglGetSyncAttribKHR

On the error path, eglGetSyncAttribKHR neglected to unlock the
EGLDisplay before returning.

Fixes deadlock in dEQP-EGL.functional.fence_sync.invalid.get_invalid_value.

Cc: mesa-stable at lists.freedesktop.org
Cc: Mark Janes <mark.a.janes at intel.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/egl/main/eglapi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 1c62a80..44fc0b8 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -1602,7 +1602,7 @@ eglGetSyncAttribKHR(EGLDisplay dpy, EGLSync sync, EGLint attribute, EGLint *valu
    EGLBoolean result;
 
    if (!value)
-      RETURN_EGL_ERROR(NULL, EGL_BAD_PARAMETER, EGL_FALSE);
+      RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
 
    attrib = *value;
    result = _eglGetSyncAttribCommon(disp, s, attribute, &attrib);




More information about the mesa-commit mailing list