zenithsiz/ftmemsim-valgrind
1
0
Fork 0
mirror of https://github.com/Zenithsiz/ftmemsim-valgrind.git synced 2026-02-03 18:13:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Free memory in the error case. Fixes bug #103168.

Browse Source 
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4043
This commit is contained in:
Nicholas Nethercote 2005-06-28 19:20:46 +00:00
parent b0dc7633a7
commit daa92e5209
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
coregrind/m_ume.c
View File

@ -275,37 +275,37 @@ struct elfinfo *readelf(int fd, const char *filename)
if (pread(fd, &e->e, sizeof(e->e), 0) != sizeof(e->e)) {
fprintf(stderr, "valgrind: %s: can't read ELF header: %s\n",
filename, strerror(errno));
return NULL;
goto bad;
}
if (memcmp(&e->e.e_ident[0], ELFMAG, SELFMAG) != 0) {
fprintf(stderr, "valgrind: %s: bad ELF magic number\n", filename);
return NULL;
goto bad;
}
if (e->e.e_ident[EI_CLASS] != VG_ELF_CLASS) {
fprintf(stderr,
"valgrind: wrong ELF executable class "
"(eg. 32-bit instead of 64-bit)\n");
return NULL;
goto bad;
}
if (e->e.e_ident[EI_DATA] != VG_ELF_ENDIANNESS) {
fprintf(stderr, "valgrind: executable has wrong endian-ness\n");
return NULL;
goto bad;
}
if (!(e->e.e_type == ET_EXEC || e->e.e_type == ET_DYN)) {
fprintf(stderr, "valgrind: this is not an executable\n");
return NULL;
goto bad;
}
if (e->e.e_machine != VG_ELF_MACHINE) {
fprintf(stderr, "valgrind: executable is not for "
"this architecture\n");
return NULL;
goto bad;
}
if (e->e.e_phentsize != sizeof(ESZ(Phdr))) {
fprintf(stderr, "valgrind: sizeof ELF Phdr wrong\n");
return NULL;
goto bad;
}
phsz = sizeof(ESZ(Phdr)) * e->e.e_phnum;
@ -314,10 +314,15 @@ struct elfinfo *readelf(int fd, const char *filename)
if (pread(fd, e->p, phsz, e->e.e_phoff) != phsz) {
fprintf(stderr, "valgrind: can't read phdr: %s\n", strerror(errno));
return NULL;
free(e->p);
goto bad;
}
return e;
bad:
free(e);
return NULL;
}
/* Map an ELF file. Returns the brk address. */