raster pushed a commit to branch master.

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

commit c827d42fbd02ea1c1149d4c5f6fd4405fc0a23af
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date:   Mon Aug 8 15:18:56 2016 +0900

    elm_need_efret() - improve error handling according to coverity
    
    fix CID 1360466
    
    we don't actually chekc if efreet inits right with elm_need_efreet()
    as we just assume it inits (And there pretty much is no case where it
    will not), but make coverity happy and check.
    
    @fix
---
 src/lib/elementary/elm_main.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index 5152394..3a22a26 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -594,11 +594,20 @@ EAPI Eina_Bool
 elm_need_efreet(void)
 {
    if (_elm_need_efreet) return EINA_TRUE;
+   if (!efreet_init()) return EINA_FALSE;
+   if (!efreet_mime_init())
+     {
+        efreet_shutdown();
+        return EINA_FALSE;
+     }
+   if (!efreet_trash_init())
+     {
+        efreet_mime_shutdown();
+        efreet_shutdown();
+        return EINA_FALSE;
+     }
    _elm_need_efreet = EINA_TRUE;
-   efreet_init();
-   efreet_mime_init();
-   efreet_trash_init();
-    /*
+   /*
      {
         Eina_List **list;
 
@@ -611,7 +620,7 @@ elm_need_efreet(void)
              *list = eina_list_prepend(*list, (void 
*)eina_stringshare_add(buf));
           }
      }
-   */
+    */
    return EINA_TRUE;
 }
 

-- 


Reply via email to