+ From: Sergei Trofimovich <slyich@gmail.com>

+ Date: Thu, 21 Dec 2023 09:23:30 +0000 (+0000)

+ Subject: tests: fix build against upcoming `gcc-14` (`-Werror=calloc-transposed-args`)

+ X-Git-Url: https://sourceware.org/git/?p=elfutils.git;a=commitdiff_plain;h=ae580d48278b9924da7503886b37be34378e1b04;hp=a2194f6b305bf0d0b9dd49dccd0a5c21994c8eea

+ 

+ tests: fix build against upcoming `gcc-14` (`-Werror=calloc-transposed-args`)

+ 

+ `gcc-14` added a new `-Wcalloc-transposed-args` warning recently. It

+ detected minor infelicity in `calloc()` API usage in `elfutils`:

+ 

+     elfstrmerge.c: In function 'main':

+     elfstrmerge.c:450:32: error:

+       'calloc' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Werror=calloc-transposed-args]

+       450 |   newscnbufs = calloc (sizeof (void *), newshnums);

+           |                                ^~~~

+     elfstrmerge.c:450:32: note: earlier argument should specify number of elements, later size of each element

+ 

+ Signed-off-by: Sergei Trofimovich <slyich@gmail.com>

+ ---

+ 

+ diff --git a/tests/elfstrmerge.c b/tests/elfstrmerge.c

+ index 56350bb91..4eb58bbb5 100644

+ --- a/tests/elfstrmerge.c

+ +++ b/tests/elfstrmerge.c

+ @@ -447,7 +447,7 @@ main (int argc, char **argv)

+      }

+  

+    newshnums = shdrnum - 1;

+ -  newscnbufs = calloc (sizeof (void *), newshnums);

+ +  newscnbufs = calloc (newshnums, sizeof (void *));

+    if (newscnbufs == NULL)

+      fail_errno ("Couldn't allocate memory for new section buffers", NULL);

+  

+ # tests: fix build against gcc-14 (-Werror=calloc-transposed-args)

+ Patch4: elfutils-0.190-gcc-14.patch