Fix format-truncation warning for gcc 9

Change-Id: I56ea250a73bd64d35b84ee9e9bc00431c56e26df
Signed-off-by: Yu jiung <jiung.yu@samsung.com>

diff --git a/popup-wifidirect/src/wfd-app-popup-view.c b/popup-wifidirect/src/wfd-app-popup-view.c
index d58170b..ae0cfda 100755 (executable)
--- a/popup-wifidirect/src/wfd-app-popup-view.c
+++ b/popup-wifidirect/src/wfd-app-popup-view.c
@@ -39,6 +39,8 @@
 #include "wfd-app-util.h"
 #include "wfd-app-popup-view.h"
 
+#define POPUP_ADDITIONAL_STR_LEN 32
+
 extern wfd_appdata_t *g_wfd_ad;
 extern wfd_popup_t *g_wfd_pop;
 extern unsigned char g_wfd_peer_mac[6];
@@ -516,7 +518,7 @@ static Eina_Bool _keypad_popup_timer_cb(void *data)
 
        char msg1[WFD_POP_STR_MAX_LEN] = {0};
        char msg2[WFD_POP_STR_MAX_LEN] = {0};
-       char label_str[WFD_POP_STR_MAX_LEN] = {0, };
+       char label_str[WFD_POP_STR_MAX_LEN * 2 + 1] = {0, };
        char * format_str = NULL;
 
        Evas_Object *label = (Evas_Object*) data;
@@ -803,7 +805,7 @@ static char *__wfd_main_desc_label_get(void *data, Evas_Object *obj,
                return NULL;
 
        WFD_APP_LOG(WFD_APP_LOG_LOW, "wfd_rename desc\n");
-       char buf[WFD_POP_STR_MAX_LEN] = {0, };
+       char buf[WFD_POP_STR_MAX_LEN * 2 + POPUP_ADDITIONAL_STR_LEN + 1] = {0, };
        char msg1[WFD_POP_STR_MAX_LEN] = {0, };
        char msg2[WFD_POP_STR_MAX_LEN] = {0, };
        char *format_str = NULL;
@@ -824,7 +826,7 @@ static char *__wfd_main_desc_label_get(void *data, Evas_Object *obj,
                snprintf(msg2, WFD_POP_STR_MAX_LEN, format_str, connection->peer_name);
 
                WFD_APP_LOG(WFD_APP_LOG_LOW, "string %s %s", msg1, msg2);
-               snprintf(buf, WFD_POP_STR_MAX_LEN,
+               snprintf(buf, sizeof(buf),
                                "<font_size=30>%s %s</font_size>",
                                msg1, msg2);
                __WFD_APP_FUNC_EXIT__;
@@ -1147,8 +1149,8 @@ void wfd_prepare_popup(int type, void *user_data)
        wfd_appdata_t *ad = wfd_get_appdata();
        wfd_popup_t *pop = ad->popup_data;
        wfd_connection_info_s *connection = ad->connection;
-       char text[WFD_POP_STR_MAX_LEN+1] = {0, };
-       char text1[WFD_POP_STR_MAX_LEN+1] = {0, };
+       char text[WFD_POP_STR_MAX_LEN + 1] = {0, };
+       char text1[WFD_POP_STR_MAX_LEN + POPUP_ADDITIONAL_STR_LEN + 1] = {0, };
        wfd_destroy_popup();
        char *peer_name;
        char *format_str = NULL;
@@ -1214,7 +1216,7 @@ void wfd_prepare_popup(int type, void *user_data)
                                                D_("IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"),
                                                peer_name, WFD_POP_TIMER_120);
 
-               snprintf(text1, WFD_POP_STR_MAX_LEN, "%s %s",
+               snprintf(text1, sizeof(text1), "%s %s",
                                text, D_("IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"));
 
                snprintf(pop->text, sizeof(pop->text), text1, connection->peer_name);
@@ -1233,7 +1235,7 @@ void wfd_prepare_popup(int type, void *user_data)
                                D_("IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"),
                                peer_name, WFD_POP_TIMER_120);
 
-               snprintf(text1, WFD_POP_STR_MAX_LEN, "%s %s %s",
+               snprintf(text1, sizeof(text1), "%s %s %s",
                                text,
                                "<br>",
                                D_("IDS_WIFI_POP_PIN_CODE_PS"));

diff --git a/popup-wifidirect/src/wfd-app-util.c b/popup-wifidirect/src/wfd-app-util.c
index 18bd5cc..7ada29f 100644 (file)
--- a/popup-wifidirect/src/wfd-app-util.c
+++ b/popup-wifidirect/src/wfd-app-util.c
@@ -69,7 +69,7 @@ char *wfd_app_trim_path(const char *filewithpath)
                start = 20 - len;
        }
 
-       strncpy((char *) filename, space, strlen(space));
+       g_strlcpy((char *) filename, space, strlen(space) + 1);
        if(strptr)
                strncpy((char *) filename + start, strptr, 50);
 

diff --git a/ug-wifidirect/src/wfd_ug_genlist.c b/ug-wifidirect/src/wfd_ug_genlist.c
index a22294e..b735c99 100755 (executable)
--- a/ug-wifidirect/src/wfd_ug_genlist.c
+++ b/ug-wifidirect/src/wfd_ug_genlist.c
@@ -28,6 +28,8 @@
 #include "wfd_ug_view.h"
 #include "wfd_client.h"
 
+#define UG_ADDITIONAL_STR_LEN 32
+
 Elm_Gen_Item_Class device_name_title_itc;
 #ifdef WFD_ON_OFF_GENLIST
 Elm_Gen_Item_Class wfd_onoff_itc;
@@ -131,7 +133,7 @@ static char *_gl_device_name_label_get(void *data, Evas_Object *obj,
        wfd_get_vconf_device_name(ugd);
        char *dev_name = NULL;
        char str[WFD_GLOBALIZATION_STR_LENGTH] = {0, };
-       char buf[WFD_GLOBALIZATION_STR_LENGTH] = {0, };
+       char buf[WFD_GLOBALIZATION_STR_LENGTH + UG_ADDITIONAL_STR_LEN + 1] = {0, };
        char *format_str = NULL;
 
        if (!strcmp("elm.text.multiline", part)) {
@@ -147,7 +149,7 @@ static char *_gl_device_name_label_get(void *data, Evas_Object *obj,
                        format_str = D_("IDS_WIFI_BODY_YOUR_DEVICE_HPS_IS_CURRENTLY_VISIBLE_TO_NEARBY_DEVICES");
                        snprintf(str, WFD_GLOBALIZATION_STR_LENGTH, format_str, dev_name);
 
-                       snprintf(buf, WFD_GLOBALIZATION_STR_LENGTH,
+                       snprintf(buf, sizeof(buf),
                                "<font_size=30>%s</font_size>", str);
 
                        WFD_IF_FREE_MEM(dev_name);