From c38bd96aaf34be4a45774243a43facd333577eef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nuno=20Gon=C3=A7alves?= Date: Tue, 16 Jan 2024 22:25:38 +0000 Subject: [PATCH] avoid GCC -O2 warning stringop-truncation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nuno Gonçalves --- components/esp_rainmaker/src/core/esp_rmaker_scenes.c | 7 ++++--- components/esp_rainmaker/src/core/esp_rmaker_schedule.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/components/esp_rainmaker/src/core/esp_rmaker_scenes.c b/components/esp_rainmaker/src/core/esp_rmaker_scenes.c index cf8583d8..83f4231b 100644 --- a/components/esp_rainmaker/src/core/esp_rmaker_scenes.c +++ b/components/esp_rainmaker/src/core/esp_rmaker_scenes.c @@ -216,11 +216,12 @@ static esp_err_t esp_rmaker_scenes_parse_info_and_flags(jparse_ctx_t *jctx, char *info = NULL; } - if (strlen(_info) > 0) { + int len = strlen(_info); + if (len > 0) { /* +1 for NULL termination */ - *info = (char *)MEM_CALLOC_EXTRAM(1, strlen(_info) + 1); + *info = (char *)MEM_CALLOC_EXTRAM(1, len + 1); if (*info) { - strncpy(*info, _info, strlen(_info)); + memcpy(*info, _info, len + 1); } } } diff --git a/components/esp_rainmaker/src/core/esp_rmaker_schedule.c b/components/esp_rainmaker/src/core/esp_rmaker_schedule.c index 45c9e347..800855cb 100644 --- a/components/esp_rainmaker/src/core/esp_rmaker_schedule.c +++ b/components/esp_rainmaker/src/core/esp_rmaker_schedule.c @@ -628,11 +628,12 @@ static esp_err_t esp_rmaker_schedule_parse_info_and_flags(jparse_ctx_t *jctx, ch *info = NULL; } - if (strlen(_info) > 0) { + int len = strlen(_info); + if (len > 0) { /* +1 for NULL termination */ - *info = (char *)MEM_CALLOC_EXTRAM(1, strlen(_info) + 1); + *info = (char *)MEM_CALLOC_EXTRAM(1, len + 1); if (*info) { - strncpy(*info, _info, strlen(_info)); + memcpy(*info, _info, len + 1); } } }