From 5a934fea0fb846535f77bccb57fe0e90fcd37c49 Mon Sep 17 00:00:00 2001 From: Semun Lee Date: Thu, 26 Dec 2019 11:08:39 +0900 Subject: [PATCH] Fix format-trunctation warning from gcc 9 Change-Id: Ia1edce376a4c9ef1521a0d1f1837324df27517a3 Signed-off-by: Semun Lee --- src/tethering.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/tethering.c b/src/tethering.c index 46c8168..0a132a7 100755 --- a/src/tethering.c +++ b/src/tethering.c @@ -14,6 +14,7 @@ * limitations under the License. */ +#define _GNU_SOURCE #include #include #include @@ -4076,8 +4077,8 @@ API int tethering_wifi_add_port_filtering_rule(tethering_h tethering, int port, GVariant *parameters; GError *error = NULL; guint result; - char cmd[MAX_BUF_SIZE] = { 0, }; char *list = NULL; + int ret; __tethering_h *th = (__tethering_h *)tethering; @@ -4104,18 +4105,17 @@ API int tethering_wifi_add_port_filtering_rule(tethering_h tethering, int port, g_variant_unref(parameters); if (allow) - snprintf(cmd, sizeof(cmd), "%s "FILTERING_RULE_STR, IPTABLES, TABLE_FILTER, TETH_FILTER_FW, protocol, port, ACTION_ACCEPT); + ret = asprintf(&list, "%s "FILTERING_RULE_STR, IPTABLES, TABLE_FILTER, TETH_FILTER_FW, protocol, port, ACTION_ACCEPT); else - snprintf(cmd, sizeof(cmd), "%s "FILTERING_RULE_STR, IPTABLES, TABLE_FILTER, TETH_FILTER_FW, protocol, port, ACTION_DROP); - - DBG("cmd:%s", cmd); + ret = asprintf(&list, "%s "FILTERING_RULE_STR, IPTABLES, TABLE_FILTER, TETH_FILTER_FW, protocol, port, ACTION_DROP); - list = strdup(cmd); - if (list == NULL) { - ERR("strdup failed\n"); //LCOV_EXCL_LINE + if (ret == -1 || list == NULL) { + ERR("asprintf failed\n"); //LCOV_EXCL_LINE return TETHERING_ERROR_OUT_OF_MEMORY; } + DBG("cmd:%s", list); + port_filtering = g_slist_append(port_filtering, list); return TETHERING_ERROR_NONE; @@ -4134,8 +4134,8 @@ API int tethering_wifi_add_custom_port_filtering_rule(tethering_h tethering, int GVariant *parameters; GError *error = NULL; guint result; - char cmd[MAX_BUF_SIZE] = { 0, }; char *list = NULL; + int ret; __tethering_h *th = (__tethering_h *)tethering; @@ -4162,18 +4162,17 @@ API int tethering_wifi_add_custom_port_filtering_rule(tethering_h tethering, int g_variant_unref(parameters); if (allow) - snprintf(cmd, sizeof(cmd), "%s "FILTERING_MULTIPORT_RULE_STR, IPTABLES, TABLE_FILTER, TETH_FILTER_FW, protocol, port1, port2, ACTION_ACCEPT); + ret = asprintf(&list, "%s "FILTERING_MULTIPORT_RULE_STR, IPTABLES, TABLE_FILTER, TETH_FILTER_FW, protocol, port1, port2, ACTION_ACCEPT); else - snprintf(cmd, sizeof(cmd), "%s "FILTERING_MULTIPORT_RULE_STR, IPTABLES, TABLE_FILTER, TETH_FILTER_FW, protocol, port1, port2, ACTION_DROP); - - DBG("cmd:%s", cmd); + ret = asprintf(&list, "%s "FILTERING_MULTIPORT_RULE_STR, IPTABLES, TABLE_FILTER, TETH_FILTER_FW, protocol, port1, port2, ACTION_DROP); - list = strdup(cmd); - if (list == NULL) { - ERR("strdup failed\n"); //LCOV_EXCL_LINE + if (ret == -1 || list == NULL) { + ERR("asprintf failed\n"); //LCOV_EXCL_LINE return TETHERING_ERROR_OUT_OF_MEMORY; } + DBG("cmd:%s", list); + custom_port_filtering = g_slist_append(custom_port_filtering, list); return TETHERING_ERROR_NONE; -- 2.7.4