/* elfcomm.c -- common code for ELF format file.
- Copyright (C) 2010-2017 Free Software Foundation, Inc.
+ Copyright (C) 2010-2020 Free Software Foundation, Inc.
Originally developed by Eric Youngdale <eric@andante.jic.com>
Modifications by Nick Clifton <nickc@redhat.com>
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
02110-1301, USA. */
+/* Do not include bfd.h in this file. Functions in this file are used
+ by readelf.c and elfedit.c which define BFD64, and by objdump.c
+ which doesn't. */
+
#include "sysdep.h"
#include "libiberty.h"
#include "filenames.h"
-#include "bfd.h"
#include "aout/ar.h"
-#include "bucomm.h"
#include "elfcomm.h"
#include <assert.h>
+extern char *program_name;
+
void
error (const char *message, ...)
{
}
}
-elf_vma (*byte_get) (unsigned char *, int);
+elf_vma (*byte_get) (const unsigned char *, int);
elf_vma
-byte_get_little_endian (unsigned char *field, int size)
+byte_get_little_endian (const unsigned char *field, int size)
{
switch (size)
{
}
elf_vma
-byte_get_big_endian (unsigned char *field, int size)
+byte_get_big_endian (const unsigned char *field, int size)
{
switch (size)
{
}
elf_vma
-byte_get_signed (unsigned char *field, int size)
+byte_get_signed (const unsigned char *field, int size)
{
elf_vma x = byte_get (field, size);
of an 8-byte value separately. */
void
-byte_get_64 (unsigned char *field, elf_vma *high, elf_vma *low)
+byte_get_64 (const unsigned char *field, elf_vma *high, elf_vma *low)
{
if (byte_get == byte_get_big_endian)
{
ARCH->sym_size and ARCH->sym_table.
It is the caller's responsibility to free ARCH->index_array and
ARCH->sym_table.
- Returns TRUE upon success, FALSE otherwise.
+ Returns 1 upon success, 0 otherwise.
If failure occurs an error message is printed. */
-static bfd_boolean
-process_archive_index_and_symbols (struct archive_info * arch,
- unsigned int sizeof_ar_index,
- bfd_boolean read_symbols)
+static int
+process_archive_index_and_symbols (struct archive_info *arch,
+ unsigned int sizeof_ar_index,
+ int read_symbols)
{
size_t got;
unsigned long size;
{
error (_("%s: invalid archive header size: %ld\n"),
arch->file_name, size);
- return FALSE;
+ return 0;
}
size = size + (size & 1);
{
error (_("%s: failed to skip archive symbol table\n"),
arch->file_name);
- return FALSE;
+ return 0;
}
}
else
if (size < sizeof_ar_index)
{
error (_("%s: the archive index is empty\n"), arch->file_name);
- return FALSE;
+ return 0;
}
/* Read the number of entries in the archive index. */
if (got != sizeof_ar_index)
{
error (_("%s: failed to read archive index\n"), arch->file_name);
- return FALSE;
+ return 0;
}
arch->index_num = byte_get_big_endian (integer_buffer, sizeof_ar_index);
{
error (_("%s: the archive index is supposed to have 0x%lx entries of %d bytes, but the size is only 0x%lx\n"),
arch->file_name, (long) arch->index_num, sizeof_ar_index, size);
- return FALSE;
+ return 0;
}
/* Read in the archive index. */
if (index_buffer == NULL)
{
error (_("Out of memory whilst trying to read archive symbol index\n"));
- return FALSE;
+ return 0;
}
got = fread (index_buffer, sizeof_ar_index, arch->index_num, arch->file);
{
free (index_buffer);
error (_("%s: failed to read archive index\n"), arch->file_name);
- return FALSE;
+ return 0;
}
size -= arch->index_num * sizeof_ar_index;
{
free (index_buffer);
error (_("Out of memory whilst trying to convert the archive symbol index\n"));
- return FALSE;
+ return 0;
}
for (i = 0; i < arch->index_num; i++)
{
error (_("%s: the archive has an index but no symbols\n"),
arch->file_name);
- return FALSE;
+ return 0;
}
arch->sym_table = (char *) malloc (size);
if (arch->sym_table == NULL)
{
error (_("Out of memory whilst trying to read archive index symbol table\n"));
- return FALSE;
+ return 0;
}
arch->sym_size = size;
{
error (_("%s: failed to read archive index symbol table\n"),
arch->file_name);
- return FALSE;
+ return 0;
}
}
{
error (_("%s: failed to read archive header following archive index\n"),
arch->file_name);
- return FALSE;
+ return 0;
}
- return TRUE;
+ return 1;
}
/* Read the symbol table and long-name table from an archive. */
int
setup_archive (struct archive_info *arch, const char *file_name,
- FILE *file, bfd_boolean is_thin_archive,
- bfd_boolean read_symbols)
+ FILE *file, off_t file_size,
+ int is_thin_archive, int read_symbols)
{
size_t got;
arch->longnames_size = 0;
arch->nested_member_origin = 0;
arch->is_thin_archive = is_thin_archive;
- arch->uses_64bit_indicies = FALSE;
+ arch->uses_64bit_indices = 0;
arch->next_arhdr_offset = SARMAG;
/* Read the first archive member header. */
}
else if (const_strneq (arch->arhdr.ar_name, "/SYM64/ "))
{
- arch->uses_64bit_indicies = TRUE;
+ arch->uses_64bit_indices = 1;
if (! process_archive_index_and_symbols (arch, 8, read_symbols))
return 1;
}
return 1;
}
/* PR 17531: file: 639d6a26. */
- if ((signed long) arch->longnames_size < 0)
+ if ((off_t) arch->longnames_size > file_size
+ || (signed long) arch->longnames_size < 0)
{
error (_("%s: long name table is too big, (size = 0x%lx)\n"),
file_name, arch->longnames_size);
const char *member_file_name)
{
FILE * member_file;
+ struct stat statbuf;
/* Have we already setup this archive? */
if (nested_arch->file_name != NULL
member_file = fopen (member_file_name, "rb");
if (member_file == NULL)
return 1;
+ if (fstat (fileno (member_file), &statbuf) < 0)
+ return 1;
return setup_archive (nested_arch, member_file_name, member_file,
- FALSE, FALSE);
+ statbuf.st_size, 0, 0);
}
/* Release the memory used for the archive information. */
arch->longnames[j] = '\0';
if (!arch->is_thin_archive || arch->nested_member_origin == 0)
- return arch->longnames + k;
+ return xstrdup (arch->longnames + k);
/* PR 17531: file: 2896dc8b. */
if (k >= j)
if (member_file_name != NULL
&& setup_nested_archive (nested_arch, member_file_name) == 0)
{
- member_name = get_archive_member_name_at (nested_arch,
+ member_name = get_archive_member_name_at (nested_arch,
arch->nested_member_origin,
NULL);
if (member_name != NULL)
free (member_file_name);
/* Last resort: just return the name of the nested archive. */
- return arch->longnames + k;
+ return xstrdup (arch->longnames + k);
}
/* We have a normal (short) name. */
if (arch->arhdr.ar_name[j] == '/')
{
arch->arhdr.ar_name[j] = '\0';
- return arch->arhdr.ar_name;
+ return xstrdup (arch->arhdr.ar_name);
}
/* The full ar_name field is used. Don't rely on ar_date starting