[Mesa-dev] [PATCH] egl_dri2: check if device_name is NULL before releasing it

Zhaowei Yuan zhaowei.yuan at samsung.com
Tue Oct 30 07:09:25 UTC 2018


Pointer dri2_dpy->device_name is probably NULL when calling
dri2_display_destory, check this before releasing it.

Signed-off-by: Zhaowei Yuan <zhaowei.yuan at samsung.com>
---
 src/egl/drivers/dri2/egl_dri2.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index c5fa935..60ae484 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -970,7 +970,8 @@ dri2_display_destroy(_EGLDisplay *disp)
    free(dri2_dpy->driver_name);
 
 #ifdef HAVE_WAYLAND_PLATFORM
-   free(dri2_dpy->device_name);
+   if (dri2_dpy->device_name)
+      free(dri2_dpy->device_name);
 #endif
 
    switch (disp->Platform) {
-- 
2.7.4



More information about the mesa-dev mailing list