From 90cb995ac9f5fce96f5a95dfdd2598d5d4cdb726 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 19 Jun 2018 13:29:16 -0400 Subject: [PATCH] emotion_generic: clean up event handlers on fork failure Summary: this case would guarantee a crash if the module was ever unloaded and the event handlers were called, and it leaks otherwise @fix Reviewers: ManMower, devilhorns, bu5hm4n Reviewed By: ManMower, bu5hm4n Subscribers: cedric, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D6296 --- src/modules/emotion/generic/emotion_generic.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/modules/emotion/generic/emotion_generic.c b/src/modules/emotion/generic/emotion_generic.c index 4aacecad4b..601e9e2d92 100644 --- a/src/modules/emotion/generic/emotion_generic.c +++ b/src/modules/emotion/generic/emotion_generic.c @@ -933,6 +933,10 @@ _fork_and_exec(Emotion_Generic_Video *ev) if (!_player_exec(ev)) { + eina_stringshare_del(ev->shmname); + ecore_event_handler_del(ev->player_add); + ecore_event_handler_del(ev->player_del); + ecore_event_handler_del(ev->player_data); ERR("could not start player."); return EINA_FALSE; }