espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-17 16:05:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

PR binutils/15140

Browse Source 
* ar.c (open_inarch): Fail on attempts to convert a normal archive
	to a thin archive or vice versa.
	* elfcomm.c (make_qualified_name): Handle corrupted thin
	archives.
	* readelf.c (process_archive): Likewise.
	* doc/binutils.texi: Clarify documentation describing thin
	archives.

	* archive.c (_bfd_get_elt_at_filepos): Prevent an infinite loop
	accessing a corrupt nested archive.
This commit is contained in:
Nick Clifton
2013-02-15 14:37:39 +00:00
parent 76d8cf45bb
commit a043396b72
7 changed files with 92 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
binutils/ar.c
View File

@ -1,7 +1,5 @@
/* ar.c - Archive modify and extract.
Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
Free Software Foundation, Inc.
Copyright 1991-2013 Free Software Foundation, Inc.
This file is part of GNU Binutils.
@ -918,6 +916,25 @@ open_inarch (const char *archive_filename, const char *file)
xexit (1);
}
if ((operation == replace || operation == quick_append)
&& bfd_openr_next_archived_file (arch, NULL) != NULL)
{
/* PR 15140: Catch attempts to convert a normal
archive into a thin archive or vice versa. */
if (make_thin_archive && ! bfd_is_thin_archive (arch))
{
fatal (_("Cannot convert existing library %s to thin format"),
bfd_get_filename (arch));
goto bloser;
}
else if (! make_thin_archive && bfd_is_thin_archive (arch))
{
fatal (_("Cannot convert existing thin library %s to normal format"),
bfd_get_filename (arch));
goto bloser;
}
}
last_one = &(arch->archive_next);
/* Read all the contents right away, regardless. */
for (next_one = bfd_openr_next_archived_file (arch, NULL);