timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

evas/cserve2: Fix segfault in cserve2 slave 

Slaves always crash when loading SVG images.
The svg module was simply not a dynamic module.
This commit is contained in:
Jean-Philippe Andre 2013-08-27 16:03:28 +09:00
parent 50be9145a1
commit 94f0e1b3e1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/evas/evas_cserve2_slave.c
View File

@ -364,7 +364,7 @@ try_extension:
if (loader) if (loader)
{ {
module = evas_module_find_type(EVAS_MODULE_TYPE_IMAGE_LOADER, loader); module = evas_module_find_type(EVAS_MODULE_TYPE_IMAGE_LOADER, loader);
if (_image_file_header(fd, skey, &load_opts, result, module)) if (module && _image_file_header(fd, skey, &load_opts, result, module))
goto success; goto success;
loader = NULL; loader = NULL;
module = NULL; module = NULL;

3
src/bin/evas/evas_cserve2_slaves.c
View File

@ -128,7 +128,8 @@ _slave_proc_dead_cb(int pid, int status EINA_UNUSED)
{ {
Slave_Proc *s; Slave_Proc *s;
INF("Child dead with pid '%d'.", pid); INF("Child dead with pid '%d': signal %d",
pid, WIFSIGNALED(status) ? WTERMSIG(status) : 0);
s = _slave_proc_find(pid); s = _slave_proc_find(pid);
if (!s) if (!s)
{ {