[elm_label] _strbuf_key_value_replace func bug fix

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 5f371f9..991988d 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -1407,7 +1407,6 @@ _get_value_in_key_string(const char *oldstring, char *key, char **value)
    return -1;
 }
 
-
 static int
 _strbuf_key_value_replace(Eina_Strbuf *srcbuf, char *key, const char *value, int deleteflag)
 {

diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index 172ed42..ead6299 100644 (file)
--- a/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@ -192,7 +192,6 @@ _get_value_in_key_string(const char *oldstring, char *key, char **value)
    return -1;
 }
 
-
 static int
 _strbuf_key_value_replace(Eina_Strbuf *srcbuf, char *key, const char *value, int deleteflag)
 {
@@ -231,21 +230,23 @@ _strbuf_key_value_replace(Eina_Strbuf *srcbuf, char *key, const char *value, int
            eina_strbuf_append_n(repbuf, starttag, tagtxtlen);
            srcstring = eina_strbuf_string_get(repbuf);
            curlocater = strstr(srcstring, key);
+
            if (curlocater != NULL)
              {
                replocater = curlocater + strlen(key) + 1;
-               while (*replocater != '=' && replocater != NULL)
+
+               while (*replocater == ' ' || *replocater == '=')
+                          {
                  replocater++;
-               if (replocater != NULL)
-                 {
-                   replocater++;
-                   while (*replocater != ' ' && *replocater != '>' && replocater == NULL)
-                     replocater++;
-                 }
-               if (replocater != NULL)
+                          }
+
+                while (*replocater != NULL && *replocater != ' ' && *replocater != '>')
+                  replocater++;
+
+               if (replocater-curlocater > strlen(key)+1)
                  {
                    replocater--;
-                   eina_strbuf_append_n(diffbuf, curlocater, replocater-curlocater);
+                   eina_strbuf_append_n(diffbuf, curlocater, replocater-curlocater+1);
                  }
                else
                  insertflag = 1;