From 6a6e580500a1d54a24448206eb037e5c60b3fb41 Mon Sep 17 00:00:00 2001
From: Jongmin Lee <jm105.lee@samsung.com>
Date: Thu, 4 Apr 2013 15:15:00 +0900
Subject: [PATCH] resolve some prevent issue

Change-Id: Iaafadcd6fff3b6279475d762ffb9e79aee33fbc7
---
 src/lib/elc_ctxpopup.c             | 2 ++
 src/lib/elm_entry.c                | 6 +++++-
 src/lib/elm_interface_scrollable.c | 2 +-
 src/lib/elm_toolbar.c              | 5 +++--
 src/lib/elm_widget.c               | 2 +-
 src/lib/els_tooltip.c              | 2 +-
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index 18e3f9a..4259d78 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -21,6 +21,8 @@ static Eina_Bool
 _elm_ctxpopup_smart_translate(Evas_Object *obj)
 {
    evas_object_hide(obj);
+
+   return EINA_TRUE;
 }
 
 static Eina_Bool
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 704020f..7bce2bb 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -1075,7 +1075,11 @@ _elm_entry_smart_theme(Evas_Object *obj)
 
    // TIZEN ONLY(130225) : when password mode, elm_object_text_get returns utf8 string.
    if (sd->password)
-     t = eina_stringshare_add(elm_entry_utf8_to_markup(elm_object_text_get(obj)));
+     {
+        char *tmp = elm_entry_utf8_to_markup(elm_object_text_get(obj));
+        t = eina_stringshare_add(tmp);
+        if (tmp) free(tmp);
+     }
    else
      t = eina_stringshare_add(elm_object_text_get(obj));
 
diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c
index 4668d6d..84bba56 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -3788,7 +3788,7 @@ _elm_scroll_repeat_events_set(Evas_Object *obj,
 static Eina_Bool
 _elm_scroll_repeat_events_get(Evas_Object *obj)
 {
-   ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(obj, sid);
+   ELM_SCROLL_IFACE_DATA_GET_OR_RETURN_VAL(obj, sid, EINA_FALSE);
 
    return evas_object_repeat_events_get(sid->event_rect);
 }
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 42ba565..8c62e67 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -1320,11 +1320,12 @@ _items_change(Elm_Toolbar_Item *reorder_from, Elm_Toolbar_Item *reorder_to)
    Elm_Toolbar_Item *prev = NULL, *next = NULL;
    int tmp;
 
+   if (!reorder_from || !reorder_to) return;
+
    ELM_TOOLBAR_DATA_GET(WIDGET(reorder_from), sd);
    if (reorder_from == reorder_to) return;
 
-   if ((reorder_from) && (reorder_to) &&
-       (!reorder_from->separator) && (!reorder_to->separator))
+   if ((!reorder_from->separator) && (!reorder_to->separator))
      {
         prev = ELM_TOOLBAR_ITEM_FROM_INLIST
             (EINA_INLIST_GET(reorder_from)->prev);
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index 941db94..aac48ed 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -2445,7 +2445,7 @@ elm_widget_focus_list_next_get(const Evas_Object *obj,
                return EINA_TRUE;
              else
                {
-                  Evas_Object *n;
+                  Evas_Object *n = NULL;
                   double degree;
                   double weight;
 
diff --git a/src/lib/els_tooltip.c b/src/lib/els_tooltip.c
index 06a6ebc..fdb469e 100644
--- a/src/lib/els_tooltip.c
+++ b/src/lib/els_tooltip.c
@@ -276,7 +276,7 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt)
         const char *style = tt->style ? tt->style : "default";
         const char *str;
         if (!_elm_theme_object_set(tt->tt_win ? NULL : tt->owner, tt->tooltip,
-                                  "tooltip", "base", style));
+                                  "tooltip", "base", style))
           {
              ERR("Could not apply the theme to the tooltip! style=%s", style);
              if (tt->tt_win) evas_object_del(tt->tt_win);
-- 
2.7.4