diff options
| author | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2011-12-13 14:43:48 +0100 |
|---|---|---|
| committer | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2011-12-13 15:29:05 +0100 |
| commit | 2649b7167affe98288dc0e4bdcd6909b8f655b77 (patch) | |
| tree | 23a78a47aaa6b1d0651e81eccc71b966194da9e5 /src/egl/drivers/dri2/egl_dri2.c | |
| parent | 23895cc006f3dbf96a502ddd15e291e071aff25a (diff) | |
egl_dri2: Fix some valigrind reported leaksleak
Free the device_name, reported by Pekka Paalanen.
Destroy wayland display and drm resources,
if created by dri2_initialize_wayland.
Diffstat (limited to 'src/egl/drivers/dri2/egl_dri2.c')
| -rw-r--r-- | src/egl/drivers/dri2/egl_dri2.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 44c9bc18d6..4c9ece351a 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -608,6 +608,8 @@ dri2_terminate(_EGLDriver *drv, _EGLDisplay *disp) close(dri2_dpy->fd); if (dri2_dpy->driver) dlclose(dri2_dpy->driver); + if (dri2_dpy->device_name) + free(dri2_dpy->device_name); if (disp->PlatformDisplay == NULL) { switch (disp->Platform) { @@ -616,14 +618,9 @@ dri2_terminate(_EGLDriver *drv, _EGLDisplay *disp) xcb_disconnect(dri2_dpy->conn); break; #endif -#ifdef HAVE_WAYLAND_PLATFORM - case _EGL_PLATFORM_WAYLAND: - wl_display_destroy(dri2_dpy->wl_dpy); - break; -#endif #ifdef HAVE_DRM_PLATFORM case _EGL_PLATFORM_DRM: - if (dri2_dpy->own_gbm_device) { + if (dri2_dpy->own_device) { gbm_device_destroy(&dri2_dpy->gbm_dri->base.base); } break; |