From: Mark Wielaard <mark@klomp.org>
Date: Sun, 21 Jan 2024 23:36:09 +0000 (+0100)
Subject: binutils: Fix calloc argument order in coffgrok.c
X-Git-Tag: gdb-15-branchpoint~1176
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd0c018e72c035330cb4bf8aeeb4e7aa0c9e1337;p=thirdparty%2Fbinutils-gdb.git

binutils: Fix calloc argument order in coffgrok.c

GCC 14 will warn about calling calloc with swapped size and count
arguments.

binutils-gdb/binutils/coffgrok.c: In function ‘do_sections_p1’:
binutils-gdb/binutils/coffgrok.c:116:72: error: ‘xcalloc’ sizes specified with ‘sizeof’ in the earlier argument and not in the later argument [-Werror=calloc-transposed-args]
  116 |   struct coff_section *all = (struct coff_section *) (xcalloc (sizeof (struct coff_section),
      |                                                                        ^~~~~~
binutils-gdb/binutils/coffgrok.c:116:72: note: earlier argument should specify number of elements, later size of each element

binutils/

	* coffgrok.c (empty_scope): Swap xcalloc arguments.
	(empty_symbol): Likewise.
	(do_lines): Likewise.
	(doit): Likewise.
	(coff_grok): Likewise.
---

diff --git a/binutils/coffgrok.c b/binutils/coffgrok.c
index 4373477ac72..f52e178be57 100644
--- a/binutils/coffgrok.c
+++ b/binutils/coffgrok.c
@@ -65,13 +65,13 @@ static bfd *                    abfd;
 static struct coff_scope *
 empty_scope (void)
 {
-  return (struct coff_scope *) (xcalloc (sizeof (struct coff_scope), 1));
+  return (struct coff_scope *) (xcalloc (1, sizeof (struct coff_scope)));
 }
 
 static struct coff_symbol *
 empty_symbol (void)
 {
-  return (struct coff_symbol *) (xcalloc (sizeof (struct coff_symbol), 1));
+  return (struct coff_symbol *) (xcalloc (1, sizeof (struct coff_symbol)));
 }
 
 static void
@@ -279,7 +279,7 @@ do_where (unsigned int i)
 static struct coff_line *
 do_lines (int i, char *name ATTRIBUTE_UNUSED)
 {
-  struct coff_line *res = (struct coff_line *) xcalloc (sizeof (struct coff_line), 1);
+  struct coff_line *res = (struct coff_line *) xcalloc (1, sizeof (struct coff_line));
   asection *s;
   unsigned int l;
 
@@ -316,8 +316,8 @@ do_lines (int i, char *name ATTRIBUTE_UNUSED)
 		  /* Add two extra records, one for the prologue and one for the epilogue.  */
 		  c += 1;
 		  res->nlines = c;
-		  res->lines = (int *) (xcalloc (sizeof (int), c));
-		  res->addresses = (int *) (xcalloc (sizeof (int), c));
+		  res->lines = (int *) (xcalloc (c, sizeof (int)));
+		  res->addresses = (int *) (xcalloc (c, sizeof (int)));
 		  res->lines[0] = start_line;
 		  res->addresses[0] = rawsyms[i].u.syment.n_value - s->vma;
 		  for (c = 0;
@@ -725,7 +725,7 @@ doit (void)
 	    struct coff_sfile *n =
 	      (struct coff_sfile *) xmalloc (sizeof (struct coff_sfile));
 
-	    n->section = (struct coff_isection *) xcalloc (sizeof (struct coff_isection), abfd->section_count + 1);
+	    n->section = (struct coff_isection *) xcalloc (abfd->section_count + 1, sizeof (struct coff_isection));
 	    cur_sfile = n;
 	    n->name = N(sym);
 	    n->next = 0;
@@ -878,7 +878,8 @@ coff_grok (bfd *inabfd)
     bfd_fatal (bfd_get_filename (abfd));
   rawsyms = obj_raw_syments (abfd);
   rawcount = obj_raw_syment_count (abfd);
-  tindex = (struct coff_symbol **) (xcalloc (sizeof (struct coff_symbol *), rawcount));
+  tindex = (struct coff_symbol **) (xcalloc (rawcount,
+					     sizeof (struct coff_symbol *)));
 
   p = doit ();
   return p;