From 2af35e112c2fef1b03cef745d138d3d05fbd34b9 Mon Sep 17 00:00:00 2001 From: sinikang Date: Wed, 13 Sep 2017 08:30:45 +0900 Subject: [PATCH] Fix to use snprintf() instead of memcpy() Change-Id: I6247870891d05d223414e36bdfaf9f0ccd348a60 --- packaging/tel-plugin-dbus_tapi.spec | 2 +- src/dtapi_sat_manager.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/tel-plugin-dbus_tapi.spec b/packaging/tel-plugin-dbus_tapi.spec index 7480e6c..7f45a74 100644 --- a/packaging/tel-plugin-dbus_tapi.spec +++ b/packaging/tel-plugin-dbus_tapi.spec @@ -1,6 +1,6 @@ %define major 0 %define minor 3 -%define patchlevel 86 +%define patchlevel 87 Name: tel-plugin-dbus_tapi Version: %{major}.%{minor}.%{patchlevel} diff --git a/src/dtapi_sat_manager.c b/src/dtapi_sat_manager.c index e4ee802..8ef134b 100644 --- a/src/dtapi_sat_manager.c +++ b/src/dtapi_sat_manager.c @@ -3678,7 +3678,7 @@ static gboolean _sat_manager_handle_send_ussd_result(struct custom_data *ctx, Tc memset(tr->terminal_rsp_data.send_ussd.text.string, 0x00, sizeof(tr->terminal_rsp_data.send_ussd.text.string)); if (output_data_len > 0) { - memcpy((void*)tr->terminal_rsp_data.send_ussd.text.string, output_data, output_data_len); + snprintf(tr->terminal_rsp_data.send_ussd.text.string, output_data_len + 1, "%s", output_data); tr->terminal_rsp_data.send_ussd.text.string_length = output_data_len; } dbg("final ussd len:%d", tr->terminal_rsp_data.send_ussd.text.string_length); @@ -3695,7 +3695,7 @@ static gboolean _sat_manager_handle_send_ussd_result(struct custom_data *ctx, Tc tr->terminal_rsp_data.send_ussd.text.string_length); memset(tr->terminal_rsp_data.send_ussd.text.string, 0x00, sizeof(tr->terminal_rsp_data.send_ussd.text.string)); - memcpy(tr->terminal_rsp_data.send_ussd.text.string, tmp, str_len); + snprintf(tr->terminal_rsp_data.send_ussd.text.string, str_len + 1, "%s", tmp); tr->terminal_rsp_data.send_ussd.text.string_length = str_len; dbg("final ussd len:%d", tr->terminal_rsp_data.send_ussd.text.string_length); for (i = 0; i < tr->terminal_rsp_data.send_ussd.text.string_length; i++) -- 2.7.4