summary refs log tree commit diff stats
path: root/migration/global_state.c
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2020-09-25 16:40:16 +0100
committerAlex Bennée <alex.bennee@linaro.org>2020-10-02 12:28:48 +0100
commit043c2c1a5d4dafa330680ca9a3a0369d9a93ef4e (patch)
tree3a5ac6b6707fe0e68ee6f07a118463326e080842 /migration/global_state.c
parentb5ce42f5d138d7546f9faa2decbd6ee8702243a3 (diff)
downloadfocaccia-qemu-043c2c1a5d4dafa330680ca9a3a0369d9a93ef4e.tar.gz
focaccia-qemu-043c2c1a5d4dafa330680ca9a3a0369d9a93ef4e.zip
migration: Silence compiler warning in global_state_store_running()
GCC 9.3.0 on Ubuntu complains:

In file included from /usr/include/string.h:495,
                 from /home/travis/build/huth/qemu/include/qemu/osdep.h:87,
                 from ../migration/global_state.c:13:
In function ‘strncpy’,
    inlined from ‘global_state_store_running’ at ../migration/global_state.c:47:5:
/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error:
 ‘__builtin_strncpy’ specified bound 100 equals destination size [-Werror=stringop-truncation]
  106 |   return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

... but we apparently really want to do a strncpy here - the size is already
checked with the assert() statement right in front of it. To silence the
warning, simply replace it with our strpadcpy() function.

Suggested-by: Philippe Mathieu-Daudé <philmd@redhat.com> (two years ago)
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200918103430.297167-4-thuth@redhat.com>
Message-Id: <20200925154027.12672-5-alex.bennee@linaro.org>
Diffstat (limited to 'migration/global_state.c')
-rw-r--r--migration/global_state.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/migration/global_state.c b/migration/global_state.c
index 25311479a4..a33947ca32 100644
--- a/migration/global_state.c
+++ b/migration/global_state.c
@@ -44,8 +44,8 @@ void global_state_store_running(void)
 {
     const char *state = RunState_str(RUN_STATE_RUNNING);
     assert(strlen(state) < sizeof(global_state.runstate));
-    strncpy((char *)global_state.runstate,
-           state, sizeof(global_state.runstate));
+    strpadcpy((char *)global_state.runstate, sizeof(global_state.runstate),
+              state, '\0');
 }
 
 bool global_state_received(void)