]> git.kaiwu.me - njs.git/commitdiff
Fixed GCC 15 build with -Wunterminated-string-initialization.
authorDmitry Volyntsev <xeioex@nginx.com>
Fri, 2 May 2025 00:05:56 +0000 (17:05 -0700)
committerDmitry Volyntsev <xeioexception@gmail.com>
Fri, 2 May 2025 01:58:11 +0000 (18:58 -0700)
In file included from src/njs_main.h:48,
                 from src/njs_diyfp.c:12:
src/njs_string.h: In function ‘njs_string_encode’:
src/njs_string.h:229:36: error: initializer-string for array of ‘unsigned char’
truncates NUL terminator but destination lacks ‘nonstring’ attribute (
17 chars into 16 available) [-Werror=unterminated-string-initialization]
  229 |     static const u_char  hex[16] = "0123456789ABCDEF";

external/qjs_query_string_module.c
src/njs_sprintf.c
src/njs_string.c
src/njs_string.h
src/qjs_buffer.c

index bb7872292b576c96aed16fd5d318b7f76aa583e1..8f695677a8c7d437784a46ebd5d875d2c7822a2b 100644 (file)
@@ -537,7 +537,7 @@ qjs_string_encode(const uint32_t *escape, size_t size, const u_char *src,
     u_char *dst)
 {
     uint8_t              byte;
-    static const u_char  hex[16] = "0123456789ABCDEF";
+    static const u_char  hex[] = "0123456789ABCDEF";
 
     do {
         byte = *src++;
index 16ae9004e217615a59dce4285ee74924d553fe54..64fae9c28db7c907a3052ba1452c1050efbb8640 100644 (file)
@@ -95,8 +95,8 @@ njs_vsprintf(u_char *buf, u_char *end, const char *fmt, va_list args)
     njs_bool_t     sign;
     njs_sprintf_t  spf;
 
-    static const u_char  hexadecimal[16] = "0123456789abcdef";
-    static const u_char  HEXADECIMAL[16] = "0123456789ABCDEF";
+    static const u_char  hexadecimal[] = "0123456789abcdef";
+    static const u_char  HEXADECIMAL[] = "0123456789ABCDEF";
     static const u_char  nan[] = "[nan]";
     static const u_char  infinity[] = "[infinity]";
 
index c38f455bd5bd48e25c29ea504314503bca439807..6d7c464dc3d9d4faa4dd3a4029551c01b8a5a11f 100644 (file)
@@ -252,7 +252,7 @@ njs_encode_hex(njs_str_t *dst, const njs_str_t *src)
     size_t        i, len;
     const u_char  *start;
 
-    static const u_char  hex[16] = "0123456789abcdef";
+    static const u_char  hex[] = "0123456789abcdef";
 
     len = src->length;
     start = src->start;
index 1961152f66618e90694e934e5e25933d257c3326..225721ed4cab8db70e0389fbb6cd552f0f804372 100644 (file)
@@ -226,7 +226,7 @@ njs_string_encode(const uint32_t *escape, size_t size, const u_char *src,
     u_char *dst)
 {
     uint8_t              byte;
-    static const u_char  hex[16] = "0123456789ABCDEF";
+    static const u_char  hex[] = "0123456789ABCDEF";
 
     do {
         byte = *src++;
index a45f57ceb5197bd3f7aa96c27cc25d6b9017b117..890b20283a17fd69820c0e312c9ae9b4da1f9f5a 100644 (file)
@@ -2354,7 +2354,7 @@ qjs_hex_encode(JSContext *ctx, const njs_str_t *src, njs_str_t *dst)
     size_t        i, len;
     const u_char  *start;
 
-    static const u_char  hex[16] = "0123456789abcdef";
+    static const u_char  hex[] = "0123456789abcdef";
 
     len = src->length;
     start = src->start;