From 12687f7d8fba945b343e4a5878b6899f76c74f27 Mon Sep 17 00:00:00 2001 From: David Jablonski Date: Wed, 4 Mar 2020 12:36:04 +0100 Subject: [PATCH] use memcpy instead of strncpy --- src/modules/mavlink/mavlink_messages.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/modules/mavlink/mavlink_messages.cpp b/src/modules/mavlink/mavlink_messages.cpp index 826388e420..77cc641312 100644 --- a/src/modules/mavlink/mavlink_messages.cpp +++ b/src/modules/mavlink/mavlink_messages.cpp @@ -422,11 +422,14 @@ protected: while ((text_size = strlen(text)) > 0) { unsigned chunk_size = math::min(text_size, max_chunk_size); - strncpy(msg.text, text, chunk_size); - // pad with zeros if (chunk_size < max_chunk_size) { + memcpy(&msg.text[0], &text[0], chunk_size + 1); + // pad with zeros memset(&msg.text + chunk_size, 0, max_chunk_size - chunk_size); + + } else { + memcpy(&msg.text[0], &text[0], chunk_size); } mavlink_msg_statustext_send_struct(_mavlink->get_channel(), &msg);