47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
|
From f9d4fad347970ddff4252312a71565a3f0be5305 Mon Sep 17 00:00:00 2001
|
||
|
|
From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Thu, 19 Sep 2024 10:00:08 +0000
|
||
|
|
Subject: [PATCH] io/channel-websock: Replace strlen(const_str) by
|
||
|
|
sizeof(const_str) - 1 mainline inclusion commit
|
||
|
|
5e689840a10e01dc2ab87defc5347337db8103da category: bugfix
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
---------------------------------------------------------------
|
||
|
|
|
||
|
|
he 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>
|
||
|
|
|
||
|
|
Signed-off-by: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
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 70889bb54d..d9fc27a003 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.41.0.windows.1
|
||
|
|
|