From 43b67459ae517457304a23a12b6f070fbd73b799 Mon Sep 17 00:00:00 2001 From: Antti Kauppila Date: Thu, 6 Jun 2019 13:12:29 +0300 Subject: [PATCH] Assert handling added --- features/cellular/framework/AT/ATHandler.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/features/cellular/framework/AT/ATHandler.cpp b/features/cellular/framework/AT/ATHandler.cpp index 98421a8f37..f9d9fe2fae 100644 --- a/features/cellular/framework/AT/ATHandler.cpp +++ b/features/cellular/framework/AT/ATHandler.cpp @@ -1165,12 +1165,18 @@ void ATHandler::handle_start(const char *cmd, const char *cmd_chr) int len = 0; memcpy(_cmd_buffer, "AT", 2); len += 2; + int cmd_char_len = 0; + if (cmd_chr) { + cmd_char_len = strlen(cmd_chr); + } + MBED_ASSERT((3 + strlen(cmd) + cmd_char_len) < BUFF_SIZE); + memcpy(_cmd_buffer + len, cmd, strlen(cmd)); len += strlen(cmd); - if (cmd_chr && strlen(cmd_chr)) { - memcpy(_cmd_buffer + len, cmd_chr, strlen(cmd_chr)); - len += strlen(cmd_chr); + if (cmd_char_len) { + memcpy(_cmd_buffer + len, cmd_chr, cmd_char_len); + len += cmd_char_len; } _cmd_buffer[len] = '\0'; cmd_start(_cmd_buffer);