[nginx] Fixed -Wunterminated-string-initialization with gcc15.
noreply at nginx.com
noreply at nginx.com
Wed Apr 23 11:49:02 UTC 2025
details: https://github.com/nginx/nginx/commit/3a97c9616cfd7c4dd3a177cb2cb583301e80404c
branches: stable-1.28
commit: 3a97c9616cfd7c4dd3a177cb2cb583301e80404c
user: Roman Arutyunyan <arut at nginx.com>
date: Wed, 16 Apr 2025 16:56:44 +0400
description:
Fixed -Wunterminated-string-initialization with gcc15.
---
src/event/quic/ngx_event_quic_protection.c | 12 +++++++-----
src/http/v2/ngx_http_v2_filter_module.c | 7 ++++---
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/event/quic/ngx_event_quic_protection.c b/src/event/quic/ngx_event_quic_protection.c
index 3f249b36a..e5c0df7b4 100644
--- a/src/event/quic/ngx_event_quic_protection.c
+++ b/src/event/quic/ngx_event_quic_protection.c
@@ -125,9 +125,10 @@ ngx_quic_keys_set_initial_secret(ngx_quic_keys_t *keys, ngx_str_t *secret,
ngx_quic_secret_t *client, *server;
ngx_quic_ciphers_t ciphers;
- static const uint8_t salt[20] =
- "\x38\x76\x2c\xf7\xf5\x59\x34\xb3\x4d\x17"
- "\x9a\xe6\xa4\xc8\x0c\xad\xcc\xbb\x7f\x0a";
+ static const uint8_t salt[20] = {
+ 0x38, 0x76, 0x2c, 0xf7, 0xf5, 0x59, 0x34, 0xb3, 0x4d, 0x17,
+ 0x9a, 0xe6, 0xa4, 0xc8, 0x0c, 0xad, 0xcc, 0xbb, 0x7f, 0x0a
+ };
client = &keys->secrets[ssl_encryption_initial].client;
server = &keys->secrets[ssl_encryption_initial].server;
@@ -958,8 +959,9 @@ ngx_quic_create_retry_packet(ngx_quic_header_t *pkt, ngx_str_t *res)
/* 5.8. Retry Packet Integrity */
static ngx_quic_md_t key = ngx_quic_md(
"\xbe\x0c\x69\x0b\x9f\x66\x57\x5a\x1d\x76\x6b\x54\xe3\x68\xc8\x4e");
- static const u_char nonce[NGX_QUIC_IV_LEN] =
- "\x46\x15\x99\xd3\x5d\x63\x2b\xf2\x23\x98\x25\xbb";
+ static const u_char nonce[NGX_QUIC_IV_LEN] = {
+ 0x46, 0x15, 0x99, 0xd3, 0x5d, 0x63, 0x2b, 0xf2, 0x23, 0x98, 0x25, 0xbb
+ };
static ngx_str_t in = ngx_string("");
ad.data = res->data;
diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index 1e2cafaf1..b63e343a0 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -115,10 +115,11 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
ngx_http_core_srv_conf_t *cscf;
u_char addr[NGX_SOCKADDR_STRLEN];
- static const u_char nginx[5] = "\x84\xaa\x63\x55\xe7";
+ static const u_char nginx[5] = { 0x84, 0xaa, 0x63, 0x55, 0xe7 };
#if (NGX_HTTP_GZIP)
- static const u_char accept_encoding[12] =
- "\x8b\x84\x84\x2d\x69\x5b\x05\x44\x3c\x86\xaa\x6f";
+ static const u_char accept_encoding[12] = {
+ 0x8b, 0x84, 0x84, 0x2d, 0x69, 0x5b, 0x05, 0x44, 0x3c, 0x86, 0xaa, 0x6f
+ };
#endif
static size_t nginx_ver_len = ngx_http_v2_literal_size(NGINX_VER);
More information about the nginx-devel
mailing list