From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11230 invoked by alias); 23 Jan 2002 06:27:50 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 11191 invoked from network); 23 Jan 2002 06:27:48 -0000 Received: from unknown (HELO cygnus.com) (205.180.230.5) by sources.redhat.com with SMTP; 23 Jan 2002 06:27:48 -0000 Received: from cse.cygnus.com (cse.sfbay.redhat.com [205.180.230.236]) by runyon.cygnus.com (8.8.7-cygnus/8.8.7) with ESMTP id WAA18818 for ; Tue, 22 Jan 2002 22:27:46 -0800 (PST) Received: (from kev@localhost) by cse.cygnus.com (8.11.6/8.11.6) id g0N6R1Z08020 for gdb-patches@sources.redhat.com; Tue, 22 Jan 2002 23:27:01 -0700 Date: Tue, 22 Jan 2002 22:27:00 -0000 From: Kevin Buettner Message-Id: <1020123062701.ZM8019@localhost.localdomain> X-Mailer: Z-Mail (4.0.1 13Jan97 Caldera) To: gdb-patches@sources.redhat.com Subject: [PATCH] Fix reversed xcalloc() calls in solib-*.c MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-SW-Source: 2002-01/txt/msg00700.txt.bz2 I've just committed the following changes. Thanks to Elena for pointing this problem out to me. * solib-aix5.c (build_so_list_from_mapfile) (aix5_relocate_main_executable): Fix xcalloc() calls so order of arguments is not reversed. * solib-sunos.c (sunos_relocate_main_executable): Likewise. * solib-svr4.c (svr4_relocate_main_executable): Likewise. Index: solib-aix5.c =================================================================== RCS file: /cvs/src/src/gdb/solib-aix5.c,v retrieving revision 1.12 diff -u -p -r1.12 solib-aix5.c --- solib-aix5.c 2001/05/04 04:15:27 1.12 +++ solib-aix5.c 2002/01/23 06:15:49 @@ -262,9 +262,9 @@ build_so_list_from_mapfile (int pid, lon if (sop == NULL) { - sop = xcalloc (sizeof (struct so_list), 1); + sop = xcalloc (1, sizeof (struct so_list)); make_cleanup (xfree, sop); - sop->lm_info = xcalloc (sizeof (struct lm_info), 1); + sop->lm_info = xcalloc (1, sizeof (struct lm_info)); make_cleanup (xfree, sop->lm_info); sop->lm_info->mapname = xstrdup (mapname); make_cleanup (xfree, sop->lm_info->mapname); @@ -714,8 +714,8 @@ aix5_relocate_main_executable (void) /* Allocate the data structure which'll contain the new offsets to relocate by. Initialize it so it contains the current offsets. */ - new_offsets = xcalloc (sizeof (struct section_offsets), - symfile_objfile->num_sections); + new_offsets = xcalloc (symfile_objfile->num_sections, + sizeof (struct section_offsets)); make_cleanup (xfree, new_offsets); for (i = 0; i < symfile_objfile->num_sections; i++) new_offsets->offsets[i] = ANOFFSET (symfile_objfile->section_offsets, i); Index: solib-sunos.c =================================================================== RCS file: /cvs/src/src/gdb/solib-sunos.c,v retrieving revision 1.2 diff -u -p -r1.2 solib-sunos.c --- solib-sunos.c 2001/11/01 16:17:08 1.2 +++ solib-sunos.c 2002/01/23 06:15:50 @@ -728,8 +728,8 @@ sunos_relocate_main_executable (void) displacement = pc - bfd_get_start_address (exec_bfd); changed = 0; - new_offsets = xcalloc (sizeof (struct section_offsets), - symfile_objfile->num_sections); + new_offsets = xcalloc (symfile_objfile->num_sections, + sizeof (struct section_offsets)); old_chain = make_cleanup (xfree, new_offsets); for (i = 0; i < symfile_objfile->num_sections; i++) Index: solib-svr4.c =================================================================== RCS file: /cvs/src/src/gdb/solib-svr4.c,v retrieving revision 1.21 diff -u -p -r1.21 solib-svr4.c --- solib-svr4.c 2001/11/01 16:17:08 1.21 +++ solib-svr4.c 2002/01/23 06:15:52 @@ -1110,8 +1110,8 @@ svr4_relocate_main_executable (void) displacement = pc - bfd_get_start_address (exec_bfd); changed = 0; - new_offsets = xcalloc (sizeof (struct section_offsets), - symfile_objfile->num_sections); + new_offsets = xcalloc (symfile_objfile->num_sections, + sizeof (struct section_offsets)); old_chain = make_cleanup (xfree, new_offsets); for (i = 0; i < symfile_objfile->num_sections; i++)