Fixed Svace Issues (WGID 8530, 56469)

[apps/native/ug-wifi-direct.git] / ug-wifidirect / src / wfd_ug_genlist.c

diff --git a/ug-wifidirect/src/wfd_ug_genlist.c b/ug-wifidirect/src/wfd_ug_genlist.c
index 31405cc..a1a4f26 100755 (executable)
--- a/ug-wifidirect/src/wfd_ug_genlist.c
+++ b/ug-wifidirect/src/wfd_ug_genlist.c
@@ -639,6 +639,7 @@ static char *_gl_peer_conn_dev_label_get(void *data, Evas_Object *obj, const cha
        char *det = NULL;
        char *buf = NULL;
        char *ssid;
+       char *convertedColor = NULL;
 
        if (data == NULL) {
                DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
@@ -658,9 +659,11 @@ static char *_gl_peer_conn_dev_label_get(void *data, Evas_Object *obj, const cha
                }
        } else if (!strcmp("elm.text.sub", part)) {
                det = elm_entry_utf8_to_markup(D_("IDS_COM_BODY_CONNECTED_M_STATUS"));
+               convertedColor = ConvertRGBAtoHex(2, 61, 132, 255);
                buf = g_strdup_printf("<color=#%s>%s</color>",
-                       ConvertRGBAtoHex(2, 61, 132, 255), det);
+                       convertedColor, det);
                WFD_IF_FREE_MEM(det);
+               g_free(convertedColor);
                __FUNC_EXIT__;
                return buf;
        }
@@ -754,7 +757,7 @@ static char *_gl_multi_connect_dev_title_label_get(void *data, Evas_Object *obj,
        }
        DBG(LOG_INFO, "%s", part);
 
-       if (!strcmp("elm.text", part)) {
+       if (!strcmp("elm.text", part) && ugd) {
                if (ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_IN_PROGRESS) {
                        return g_strdup(D_("IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"));
                } else if (ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_COMPLETED) {