Merge branch 'bugfix/stringop_truncation_warnings' into 'master'

Avoid GCC -O2 warning stringop-truncation See merge request app-frameworks/esp-rainmaker!474
espressif · Sep 9, 2024 · 19c78e0 · 19c78e0
2 parents ef22ee8 + c38bd96
commit 19c78e0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git 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
@@ -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);
             }
         }
     }