enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

ecore-drm: Fix improper shutdown for error cases in ecore_drm_init 

If an error occurs during ecore_drm_init, we need to cleanup things in
the proper order. This fixes the case where ecore_event_shutdown and
ecore_shutdown May Not have been called (in previous revision) due to
the error conditions being out of order.

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2014-07-24 11:33:21 -04:00
parent ab38ffd6ed
commit 0001b65783
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/ecore_drm/ecore_drm.c
View File

@ -67,7 +67,7 @@ ecore_drm_init(void)
eina_log_domain_level_set("ecore_drm", EINA_LOG_LEVEL_DBG);
/* get sd-login properties we need */
if (sd_pid_get_session(getpid(), &sid) < 0) goto log_err;
if (sd_pid_get_session(getpid(), &sid) < 0) goto sd_err;
/* try to init dbus */
if (!_ecore_drm_dbus_init(sid)) goto dbus_err;
@ -81,12 +81,13 @@ ecore_drm_init(void)
udev_err:
_ecore_drm_dbus_shutdown();
dbus_err:
ecore_event_shutdown();
ecore_shutdown();
free(sid);
sd_err:
eina_log_domain_unregister(_ecore_drm_log_dom);
_ecore_drm_log_dom = -1;
free(sid);
log_err:
ecore_event_shutdown();
ecore_shutdown();
eina_shutdown();
return --_ecore_drm_init_count;
}