[EGIT] [core/enlightenment] master 02/02: e wl - drm - fix dlopening of libecore_drm2

[Carsten Haitzler]

raster pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=951bb66fa05a7fcc436048c93b9e9af3465cc083

commit 951bb66fa05a7fcc436048c93b9e9af3465cc083
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Sat Sep 5 12:05:49 2020 +0100

    e wl - drm - fix dlopening of libecore_drm2
    
    this should load .so.1 not .so ... and it shouldnt dlclose a null dl
    handle. fix a crash
    
    @fix
---
 src/bin/e_drm2.x | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/bin/e_drm2.x b/src/bin/e_drm2.x
index 6ef705814..097211d3e 100644
--- a/src/bin/e_drm2.x
+++ b/src/bin/e_drm2.x
@@ -28,10 +28,11 @@ e_drm2_compat_init(void)
    if (!sym_##sym##_##ver) \
      { \
         dlclose(e_drm2_lib); \
+        e_drm2_lib = NULL; \
         return EINA_FALSE; \
      }
 
-   e_drm2_lib = dlopen("libecore_drm2.so", RTLD_NOW | RTLD_LOCAL);
+   e_drm2_lib = dlopen("libecore_drm2.so.1", RTLD_NOW | RTLD_LOCAL);
 
    if (E_DRM2_EFL_VERSION_MINIMUM(1, 21, 99))
      {
@@ -62,7 +63,7 @@ e_drm2_compat_init(void)
 static void
 e_drm2_compat_shutdown(void)
 {
-   dlclose(e_drm2_lib);
+   if (e_drm2_lib) dlclose(e_drm2_lib);
 }
 
 static inline Ecore_Drm2_Device *

--