[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/6] migration: Silence compiler warning in global_state_store_ru
From: |
Thomas Huth |
Subject: |
[PATCH 3/6] migration: Silence compiler warning in global_state_store_running() |
Date: |
Fri, 18 Sep 2020 12:34:27 +0200 |
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)
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
migration/global_state.c | 4 ++--
1 file 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)
--
2.18.2
- [PATCH 0/6] Update Travis from Xenial to Bionic and Focal, Thomas Huth, 2020/09/18
- [PATCH 1/6] meson: move libudev test, Thomas Huth, 2020/09/18
- [PATCH 2/6] meson: move libmpathpersist test, Thomas Huth, 2020/09/18
- [PATCH 5/6] travis.yml: Update Travis to use Bionic and Focal instead of Xenial, Thomas Huth, 2020/09/18
- [PATCH 4/6] travis.yml: Drop the default softmmu builds, Thomas Huth, 2020/09/18
- [PATCH 3/6] migration: Silence compiler warning in global_state_store_running(),
Thomas Huth <=
- [PATCH 6/6] travis.yml: Drop the superfluous Python 3.6 build, Thomas Huth, 2020/09/18
- Re: [PATCH 0/6] Update Travis from Xenial to Bionic and Focal, Paolo Bonzini, 2020/09/18
- Re: [PATCH 0/6] Update Travis from Xenial to Bionic and Focal, Alex Bennée, 2020/09/21
- [PATCH 7/6] travis.yml: Drop the Python 3.5 build, Thomas Huth, 2020/09/22