c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-06-12 08:44:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

GCC 15: Fix unterminated-string-initialization (#17244)

Browse Source 
Fix build errors on Fedora 42 like:

  module/zcommon/zfs_valstr.c:193:16: error: initializer-string for
  array of 'char' truncates NUL terminator but destination lacks
  'nonstring' attribute (3 chars into 2 available)

The arrays in zpool_vdev_os.c and zfs_valstr.c don't need to be
NULL terminated, but we do so to make GCC happy.

Closes: #17242

Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
Tony Hutter 2025-04-16 09:33:29 -07:00 committed by GitHub
parent 4866c2fabf
commit 155847c72d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/zpool/os/linux/zpool_vdev_os.c
View File

@ -88,7 +88,8 @@
typedef struct vdev_disk_db_entry typedef struct vdev_disk_db_entry
{ {
char id[24]; /* 24 byte name + 1 byte NULL terminator to make GCC happy */
char id[25];
int sector_size; int sector_size;
} vdev_disk_db_entry_t; } vdev_disk_db_entry_t;

4
module/zcommon/zfs_valstr.c
View File

@ -39,7 +39,9 @@
*/ */
typedef struct { typedef struct {
const char vb_bit; const char vb_bit;
const char vb_pair[2];
/* 2 byte name + 1 byte NULL terminator to make GCC happy */
const char vb_pair[3];
const char *vb_name; const char *vb_name;
} valstr_bit_t; } valstr_bit_t;

2
tests/zfs-tests/cmd/file/largest_file.c
View File

@ -62,7 +62,7 @@ main(int argc, char **argv)
offset_t llseek_ret = 0; offset_t llseek_ret = 0;
int write_ret = 0; int write_ret = 0;
int err = 0; int err = 0;
char mybuf[5] = "aaaa\0"; char mybuf[5] = "aaaa";
char *testfile; char *testfile;
mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH; mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
struct sigaction sa; struct sigaction sa;