cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=12072b22179f3e48b4ad850f78e5b4ff5442208f

commit 12072b22179f3e48b4ad850f78e5b4ff5442208f
Author: Cedric BAIL <ced...@efl.so>
Date:   Mon Oct 14 13:45:26 2013 +0200

    edje: fix CID 1062226 - Dereference after null check.
    
    It seems to be possible in some badly crafted edj to trigger that path.
---
 src/bin/edje/edje_cc_handlers.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index dc01352..9ad50f6 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -5192,9 +5192,8 @@ st_collections_group_parts_part_description_inherit(void)
             if (min_dst)
               {
                   WRN("%s:%i: couldn't find an exact match in part '%s' when 
looking for '%s' %lf. Falling back to nearest one '%s' %lf.",
-                      file_in, line - 1, ep->name, parent_name, parent_val, 
parent->state.name, parent->state.value);
+                      file_in, line - 1, ep->name, parent_name, parent_val, 
parent ? parent->state.name : NULL, parent ? parent->state.value : NULL);
                }
-                    
           }
 
         if (!parent)

-- 


Reply via email to