diff options
| author | Jean-Philippe Andre <jp.andre@samsung.com> | 2013-08-27 16:03:28 +0900 |
|---|---|---|
| committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2013-10-28 15:47:14 +0900 |
| commit | 94f0e1b3e1be60dc751c4f8a51191402e79cc951 (patch) | |
| tree | 6c64f0996db90df507ae255c48f8369f32eabd69 /src | |
| parent | 50be9145a1d6706ae0aaa5a81211e214d37422fd (diff) | |
| download | efl-94f0e1b3e1be60dc751c4f8a51191402e79cc951.tar.gz | |
evas/cserve2: Fix segfault in cserve2 slave
Slaves always crash when loading SVG images.
The svg module was simply not a dynamic module.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/evas/evas_cserve2_slave.c | 2 | ||||
| -rw-r--r-- | src/bin/evas/evas_cserve2_slaves.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/bin/evas/evas_cserve2_slave.c b/src/bin/evas/evas_cserve2_slave.c index 5f9bc3246c..da6099ba59 100644 --- a/src/bin/evas/evas_cserve2_slave.c +++ b/src/bin/evas/evas_cserve2_slave.c @@ -364,7 +364,7 @@ try_extension: if (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; loader = NULL; module = NULL; diff --git a/src/bin/evas/evas_cserve2_slaves.c b/src/bin/evas/evas_cserve2_slaves.c index a1fc7f5c82..82f3e2b6d5 100644 --- a/src/bin/evas/evas_cserve2_slaves.c +++ b/src/bin/evas/evas_cserve2_slaves.c @@ -128,7 +128,8 @@ _slave_proc_dead_cb(int pid, int status EINA_UNUSED) { 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); if (!s) { |