Fixed prevent issues:56236,38820,30368,24310,28344,56426,25511,22275,24788,45558...

Change-Id: I7f8c595d291662458d5c85d5a82a33ce07973482

diff --git a/src/edje_externals/elm_entry.c b/src/edje_externals/elm_entry.c
index d4d51b9..05fcea1 100644 (file)
--- a/src/edje_externals/elm_entry.c
+++ b/src/edje_externals/elm_entry.c
@@ -25,7 +25,7 @@ typedef struct _Elm_Params_Entry
 
 #define CHOICE_GET(CHOICES, STR)                \
   unsigned int i;                               \
-  for (i = 0; i < sizeof(CHOICES); i++)         \
+  for (i = 0; i < sizeof(CHOICES)/sizeof(CHOICES[0]); i++)         \
     if (strcmp(STR, CHOICES[i]) == 0)           \
       return i
 

diff --git a/src/lib/elm_cbhm_helper.c b/src/lib/elm_cbhm_helper.c
index e580ef4..54fb482 100644 (file)
--- a/src/lib/elm_cbhm_helper.c
+++ b/src/lib/elm_cbhm_helper.c
@@ -117,6 +117,7 @@ void _search_clipboard_window(Ecore_X_Window w)
        {
                for(i = 0; i < nchildren; i++)
                        _search_clipboard_window(wchild[i]);
+               XFree(wchild);
        }
 #endif
 }
@@ -130,7 +131,7 @@ int _send_clipboard_events(char *cmd)
        Atom atomCBHM_MSG = XInternAtom(cbhm_disp, "CBHM_MSG", False);
 
        XClientMessageEvent m;
-       memset(&m, sizeof(m), 0);
+       memset(&m, 0, sizeof(m));
        m.type = ClientMessage;
        m.display = cbhm_disp;
        m.window = self_win;

diff --git a/src/lib/elm_cnp_helper.c b/src/lib/elm_cnp_helper.c
index 7c87a89..ad9a51f 100644 (file)
--- a/src/lib/elm_cnp_helper.c
+++ b/src/lib/elm_cnp_helper.c
@@ -823,8 +823,7 @@ _set_EFL_item_data(PItemTagData data, const char *tag_str)
         if (path)
           {
              char *modify = malloc(sizeof(char) * (strlen(value) + 1));
-             strncpy(modify, "file://", 7);
-             modify[7] = '\0';
+             strncpy(modify, "file://", 8);
              path += 7;
              while (path[1] && path[0] && path[1] == '/' && path[0] == '/')
                {
@@ -905,8 +904,7 @@ _set_HTML_img_data(PItemTagData data, const char *tag_str)
         if (path)
           {
              char *modify = malloc(sizeof(char) * (strlen(value) + 1));
-             strncpy(modify, "file://", 7);
-             modify[7] = '\0';
+             strncpy(modify, "file://", 8);
              path += 7;
              while (path[1] && path[0] && path[1] == '/' && path[0] == '/')
                {
@@ -1939,14 +1937,20 @@ edje_converter(char *target __UNUSED__, void *data, int size __UNUSED__, void **
         if (edje)
           *data_ret = edje;
         else
-          *data_ret = strdup(sel->selbuf);
+           if (sel->selbuf)
+             *data_ret = strdup(sel->selbuf);
+           else
+             *data_ret = strdup("");
      }
    if (size_ret)
      {
         if (edje)
           *size_ret = strlen(edje);
         else
-          *size_ret = strlen(sel->selbuf);
+          if (sel->selbuf)
+            *size_ret = strlen(sel->selbuf);
+          else
+            *size_ret = 0;
      }
 
    return EINA_TRUE;
@@ -2006,7 +2010,10 @@ html_converter(char *target __UNUSED__, void *data, int size __UNUSED__, void **
         if (html)
           *data_ret = html;
         else
-          *data_ret = strdup(sel->selbuf);
+          if (sel->selbuf)
+            *data_ret = strdup(sel->selbuf);
+          else
+            *data_ret = strdup("");
      }
 
    if (size_ret)
@@ -2014,7 +2021,10 @@ html_converter(char *target __UNUSED__, void *data, int size __UNUSED__, void **
         if (html)
           *size_ret = strlen(html);
         else
-          *size_ret = strlen(sel->selbuf);
+          if (sel->selbuf)
+            *size_ret = strlen(sel->selbuf);
+          else
+            *size_ret = 0;
      }
    if (convert_target != sel->selbuf)
      free(convert_target);
@@ -2700,7 +2710,6 @@ elm_cnp_tempfile_create(int size)
 
    tmppath = getenv("TMP");
    if (!tmppath) tmppath = P_tmpdir;
-   if (!tmppath) tmppath = "/tmp";
    len = snprintf(NULL, 0, "%s/%sXXXXXX", tmppath, "elmcnpitem-");
    if (len < 0)
      {

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 08e8cc0..faf4db4 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -1755,14 +1755,23 @@ _matchlist_show(void *data)
 
                   textlen = strlen(str_list) - strlen(str_result);
                   str_front = malloc(textlen + 1);
-                  if (str_front == NULL) return;
+                  if (str_front == NULL)
+                    {
+                       free(str_mkup);
+                       return;
+                    }
 
                   memset(str_front, 0, textlen + 1);
                   strncpy(str_front, str_list, textlen);
 
                   textlen = strlen(text);
                   str_mid = malloc(textlen + 1);
-                  if (str_mid == NULL) return;
+                  if (str_mid == NULL)
+                    {
+                       free(str_mkup);
+                       free(str_front);
+                       return;
+                    }
 
                   memset(str_mid, 0, textlen + 1);
                   strncpy(str_mid, str_list + strlen(str_front), textlen);
@@ -1797,17 +1806,20 @@ static void _matchlist_list_clicked( void *data, Evas_Object *obj, void *event_i
    if ((it == NULL) || (wd == NULL))
      return;
 
+   const char *str = NULL;
    const char *text = elm_list_item_label_get(it);
    evas_object_smart_callback_call((Evas_Object *)data, "selected", (void *)text);
    if (wd->match_list)
      {
         if (text != NULL)
           {
-             elm_entry_entry_set(data, elm_entry_markup_to_utf8(text));
+             str = elm_entry_markup_to_utf8(text);
+             elm_entry_entry_set(data, str);
              elm_entry_cursor_end_set(data);
              wd->matchlist_list_clicked = EINA_TRUE;
 
              evas_object_smart_callback_call(data, SIG_MATCHLIST_CLICKED, elm_entry_markup_to_utf8(text));
+             free(str);
           }
      }
    elm_widget_focus_set(data, EINA_TRUE);
@@ -2420,16 +2432,16 @@ _strbuf_key_value_replace(Eina_Strbuf *srcbuf, char *key, const char *value, int
 {
    const char *srcstring = NULL;
    Eina_Strbuf *repbuf = NULL, *diffbuf = NULL;
-   char *curlocater, *replocater;
+   char *curlocater = NULL, *replocater;
    char *starttag, *endtag;
    int tagtxtlen = 0, insertflag = 0;
 
    srcstring = eina_strbuf_string_get(srcbuf);
-   curlocater = strstr(srcstring, key);
-
+   if (srcstring)
+     curlocater = strstr(srcstring, key);
    if (!curlocater || !srcstring)
      {
-       insertflag = 1;
+        insertflag = 1;
      }
    else
      {
@@ -3104,6 +3116,7 @@ elm_entry_is_empty(const Evas_Object *obj)
 
    ret = (strlen(str) == 0);
 
+   free(str);
    return ret;
 }