jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=94f0e1b3e1be60dc751c4f8a51191402e79cc951

commit 94f0e1b3e1be60dc751c4f8a51191402e79cc951
Author: Jean-Philippe Andre <[email protected]>
Date:   Tue Aug 27 16:03:28 2013 +0900

    evas/cserve2: Fix segfault in cserve2 slave
    
    Slaves always crash when loading SVG images.
    The svg module was simply not a dynamic module.
---
 src/bin/evas/evas_cserve2_slave.c  | 2 +-
 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 5f9bc32..da6099b 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 a1fc7f5..82f3e2b 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)
      {

-- 


Reply via email to