mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-25 17:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

swaynag/config.c: fix build against gcc-14 (-Walloc-size)

Browse source 
`gcc-14` added a new `-Walloc-size` warning that makes sure that size of
an individual element matches size of a pointed type:

        https://gcc.gnu.org/PR71219

`sway` triggers it on `calloc()` calls where member size is used as
`1` (instead of member count):

    swaynag/config.c:169:65: error: allocation of insufficient size '1'
     for type 'struct swaynag_button' with size '48' [-Werror=alloc-size]
      169 | struct swaynag_button *button = calloc(sizeof(struct swaynag_button), 1);
This commit is contained in:
Sergei Trofimovich 2023-11-03 12:17:39 +00:00 committed by Simon Ser
parent 6f6b82793d
commit 020a572ed6
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
swaynag/config.c
View file

@ -166,7 +166,7 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
fprintf(stderr, "Missing action for button %s\n", optarg); fprintf(stderr, "Missing action for button %s\n", optarg);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
struct swaynag_button *button = calloc(sizeof(struct swaynag_button), 1); struct swaynag_button *button = calloc(1, sizeof(struct swaynag_button));
if (!button) { if (!button) {
perror("calloc"); perror("calloc");
return EXIT_FAILURE; return EXIT_FAILURE;