[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 04/11] io/channel-websock: Replace strlen(const_str) by sizeof
From: |
Peter Maydell |
Subject: |
[PATCH v2 04/11] io/channel-websock: Replace strlen(const_str) by sizeof(const_str) - 1 |
Date: |
Fri, 19 Aug 2022 16:39:24 +0100 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
The combined_key[... QIO_CHANNEL_WEBSOCK_GUID_LEN ...] array in
qio_channel_websock_handshake_send_res_ok() expands to a call
to strlen(QIO_CHANNEL_WEBSOCK_GUID), and the compiler doesn't
realize the string is const, so consider combined_key[] being
a variable-length array.
To remove the variable-length array, we provide it a hint to
the compiler by using sizeof() - 1 instead of strlen().
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
io/channel-websock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/io/channel-websock.c b/io/channel-websock.c
index 9619906ac36..fb4932ade70 100644
--- a/io/channel-websock.c
+++ b/io/channel-websock.c
@@ -32,7 +32,7 @@
#define QIO_CHANNEL_WEBSOCK_CLIENT_KEY_LEN 24
#define QIO_CHANNEL_WEBSOCK_GUID "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
-#define QIO_CHANNEL_WEBSOCK_GUID_LEN strlen(QIO_CHANNEL_WEBSOCK_GUID)
+#define QIO_CHANNEL_WEBSOCK_GUID_LEN (sizeof(QIO_CHANNEL_WEBSOCK_GUID) - 1)
#define QIO_CHANNEL_WEBSOCK_HEADER_PROTOCOL "sec-websocket-protocol"
#define QIO_CHANNEL_WEBSOCK_HEADER_VERSION "sec-websocket-version"
--
2.25.1
- [PATCH v2 00/11] misc: Remove variable-length arrays on the stack, Peter Maydell, 2022/08/19
- [PATCH v2 03/11] chardev/baum: Avoid dynamic stack allocation, Peter Maydell, 2022/08/19
- [PATCH v2 04/11] io/channel-websock: Replace strlen(const_str) by sizeof(const_str) - 1,
Peter Maydell <=
- [PATCH v2 02/11] chardev/baum: Use definitions to avoid dynamic stack allocation, Peter Maydell, 2022/08/19
- [PATCH v2 01/11] chardev/baum: Replace magic values by X_MAX / Y_MAX definitions, Peter Maydell, 2022/08/19
- [PATCH v2 05/11] hw/net/e1000e_core: Use definition to avoid dynamic stack allocation, Peter Maydell, 2022/08/19
- [PATCH v2 06/11] hw/ppc/pnv: Avoid dynamic stack allocation, Peter Maydell, 2022/08/19
- [PATCH v2 07/11] hw/intc/xics: Avoid dynamic stack allocation, Peter Maydell, 2022/08/19
- [PATCH v2 10/11] ui/curses: Avoid dynamic stack allocation, Peter Maydell, 2022/08/19
- [PATCH v2 09/11] hw/usb/hcd-ohci: Use definition to avoid dynamic stack allocation, Peter Maydell, 2022/08/19
- [PATCH v2 11/11] tests/unit/test-vmstate: Avoid dynamic stack allocation, Peter Maydell, 2022/08/19
- [PATCH v2 08/11] hw/i386/multiboot: Avoid dynamic stack allocation, Peter Maydell, 2022/08/19