Fix to use snprintf() instead of memcpy()

- Ensure null termination

Change-Id: Ie6df91619fe0a6a2aead32d5855b52a135de1be3

diff --git a/packaging/tel-plugin-dbus_tapi.spec b/packaging/tel-plugin-dbus_tapi.spec
index 35e95e4..80ffc1c 100644 (file)
--- 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 81
+%define patchlevel 82
 
 Name:           tel-plugin-dbus_tapi
 Version:        %{major}.%{minor}.%{patchlevel}

diff --git a/src/dtapi_sat_manager.c b/src/dtapi_sat_manager.c
index eef7871..49b31dc 100644 (file)
--- a/src/dtapi_sat_manager.c
+++ b/src/dtapi_sat_manager.c
@@ -3657,7 +3657,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 (packed_data) {
-                                               memcpy((void*)tr->terminal_rsp_data.send_ussd.text.string, packed_data, strlen(packed_data));
+                                               snprintf(tr->terminal_rsp_data.send_ussd.text.string, strlen(packed_data) + 1, "%s", packed_data);
                                                tr->terminal_rsp_data.send_ussd.text.string_length = strlen(packed_data);
                                                g_free(packed_data);
                                        }
@@ -4059,7 +4059,8 @@ static gboolean sat_manager_handle_open_channel_result(struct custom_data *ctx,
                tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.local_link_bearer_param.service_type = service_type;
 
                if (service_record) {
-                       memcpy(tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.local_link_bearer_param.service_record, service_record, strlen(service_record));
+                       snprintf(tr->terminal_rsp_data.open_channel.bearer_desc.bearer_parameter.local_link_bearer_param.service_record,
+                               strlen(service_record) + 1, "%s", service_record);
                        g_free(service_record);
                }
        } break;
@@ -5046,7 +5047,7 @@ static gboolean _sat_manager_handle_get_input_confirm(struct custom_data *ctx, T
                                packed_data = (char*) tcore_util_pack_gsm7bit((const unsigned char *)tmp_str, tmp_len);
 
                                if (packed_data) {
-                                       memcpy((void*)tr->terminal_rsp_data.get_input.text.string, packed_data, strlen(packed_data));
+                                       snprintf(tr->terminal_rsp_data.get_input.text.string, strlen(packed_data) + 1, "%s", packed_data);
                                        tr->terminal_rsp_data.get_input.text.string_length = strlen(packed_data);
 
                                        g_free(packed_data);