aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2013-06-14 14:52:57 +0900
committerCedric Bail <cedric.bail@samsung.com>2013-06-14 16:38:18 +0900
commit42309042c6e63944cda26e9f7f89cf56d6af3643 (patch)
treea54690631997468579e580d8aefb2312f213afea
parentevas/cserve2: (shutdown) fix double free issue (diff)
downloadefl-42309042c6e63944cda26e9f7f89cf56d6af3643.tar.gz
evas/cserve2: fix crash when shutting down cserve2
If a slave is still alive during shutdown, then it will be killed and the dead callback should be called. This would then trigger a request failed callback on invalid data. But there's no point in calling the dead_cb since we're shutting down already.
-rw-r--r--src/bin/evas/evas_cserve2_slaves.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/bin/evas/evas_cserve2_slaves.c b/src/bin/evas/evas_cserve2_slaves.c
index be0df8fd8d..277f36c5aa 100644
--- a/src/bin/evas/evas_cserve2_slaves.c
+++ b/src/bin/evas/evas_cserve2_slaves.c
@@ -302,6 +302,9 @@ cserve2_slaves_shutdown(void)
EINA_LIST_FREE(slave_procs, sp)
{
+ Slave *s = (Slave*) sp;
+
+ s->dead_cb = NULL;
kill(sp->pid, SIGKILL);
_slave_proc_free(sp);
}