Fixed null dereference and dead code

Change-Id: I29bbce41ab4b891c6ef5adfa20bbc67c72ee1aea

diff --git a/src/0000_easy.c b/src/0000_easy.c
index 1885017..07a2674 100644 (file)
--- a/src/0000_easy.c
+++ b/src/0000_easy.c
@@ -49,6 +49,12 @@ _cb_prop_registrant(void *data,
    Eina_Bool res;
    char *type;
 
+   if (!tc)
+     {
+        elm_exit();
+        return;
+     }
+
    tc->passed = EINA_FALSE;
 
    res = eldbus_message_error_get(msg, &name, &text);
@@ -59,6 +65,7 @@ _cb_prop_registrant(void *data,
    EINA_SAFETY_ON_NULL_GOTO(variant, finish);
 
    type = eldbus_message_iter_signature_get(variant);
+   EINA_SAFETY_ON_NULL_GOTO(type, finish);
    EINA_SAFETY_ON_FALSE_GOTO((type[0] == 'u'), finish);
 
    res = eldbus_message_iter_arguments_get(variant, "u", &win);
@@ -68,7 +75,7 @@ _cb_prop_registrant(void *data,
    tc->passed = EINA_TRUE;
 
 finish:
-   if ((tc) && (!tc->passed))
+   if (!tc->passed)
      {
         ERR("errname:%s errmsg:%s\n", name, text);
      }

diff --git a/src/e_test_runner.c b/src/e_test_runner.c
index 71cb10e..1ea4c66 100644 (file)
--- a/src/e_test_runner.c
+++ b/src/e_test_runner.c
@@ -77,8 +77,9 @@ _e_test_runner_window_id_get(Evas_Object *elm_win)
    if (tizen_resource) tizen_resource_destroy(tizen_resource);
 
    return id;
-#endif
+#else
    return elm_win_window_id_get(elm_win);
+#endif
 }
 
 static void
@@ -592,6 +593,12 @@ _e_tc_add(unsigned int num,
    E_TC *tc;
 
    tc = E_NEW(E_TC, 1);
+   if (!tc)
+     {
+        ERR("Can't allocate E_TC %s", name);
+        return NULL;
+     }
+
 
    tc->num = num;
    tc->name = name;