yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elfedit: Move ELF header magic bytes check to get_file_header

Browse Source 
Skip the file if ELF header magic bytes doesn't match.

	* elfedit.c (update_elf_header): Move EI_MAG? check to ...
	(get_file_header): Here.
This commit is contained in:
H.J. Lu 2018-11-03 15:03:34 -07:00
parent 470678d7c9
commit 675accbdcb
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
binutils/ChangeLog
View File

@ -1,3 +1,8 @@
2018-11-03 H.J. Lu <hongjiu.lu@intel.com>
* elfedit.c (update_elf_header): Move EI_MAG? check to ...
(get_file_header): Here.
2018-11-02 H.J. Lu <hongjiu.lu@intel.com>
* configure.ac (AC_FUNC_MMAP): New.

19
binutils/elfedit.c
View File

@ -91,17 +91,6 @@ update_elf_header (const char *file_name, FILE *file)
{
int class, machine, type, status, osabi;
if (elf_header.e_ident[EI_MAG0] != ELFMAG0
|| elf_header.e_ident[EI_MAG1] != ELFMAG1
|| elf_header.e_ident[EI_MAG2] != ELFMAG2
|| elf_header.e_ident[EI_MAG3] != ELFMAG3)
{
error
(_("%s: Not an ELF file - wrong magic bytes at the start\n"),
file_name);
return 0;
}
if (elf_header.e_ident[EI_VERSION] != EV_CURRENT)
{
error
@ -212,6 +201,12 @@ get_file_header (FILE * file)
if (fread (elf_header.e_ident, EI_NIDENT, 1, file) != 1)
return 0;
if (elf_header.e_ident[EI_MAG0] != ELFMAG0
|| elf_header.e_ident[EI_MAG1] != ELFMAG1
|| elf_header.e_ident[EI_MAG2] != ELFMAG2
|| elf_header.e_ident[EI_MAG3] != ELFMAG3)
return 0;
/* Determine how to read the rest of the header. */
switch (elf_header.e_ident[EI_DATA])
{
@ -232,8 +227,6 @@ get_file_header (FILE * file)
switch (elf_header.e_ident[EI_CLASS])
{
default:
error (_("Unsupported EI_CLASS: %d\n"),
elf_header.e_ident[EI_CLASS]);
return 0;
case ELFCLASS32: