diff options
| author | Ray Lai <ray@cvs.openbsd.org> | 2007-02-08 03:50:50 +0000 |
|---|---|---|
| committer | Ray Lai <ray@cvs.openbsd.org> | 2007-02-08 03:50:50 +0000 |
| commit | 0d2ebe86c2f33e49287b8e0a91cb7ded96e1b47e (patch) | |
| tree | 1e6a1801613cb26afbbad9efc49daf13cd781742 | |
| parent | a926b417e414e7f05ee9a1e6fb9642e8c89c78c2 (diff) | |
Do all allocation and deallocation of shstr in elf_symload() to
prevent double-freeing shstr.
Also don't free known NULL values (*pnames and *psnames).
Initially inspired by Charles Longeau's first diff to tech@; he
later sent a second diff to tech@ nearly identical to this commit.
Freaky.
OK mickey@.
| -rw-r--r-- | usr.bin/nm/elf.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/usr.bin/nm/elf.c b/usr.bin/nm/elf.c index 888f2ffe111..a6c8f04ff1f 100644 --- a/usr.bin/nm/elf.c +++ b/usr.bin/nm/elf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: elf.c,v 1.15 2007/02/07 10:20:40 mickey Exp $ */ +/* $OpenBSD: elf.c,v 1.16 2007/02/08 03:50:49 ray Exp $ */ /* * Copyright (c) 2003 Michael Shalayeff @@ -27,7 +27,7 @@ */ #ifndef lint -static const char rcsid[] = "$OpenBSD: elf.c,v 1.15 2007/02/07 10:20:40 mickey Exp $"; +static const char rcsid[] = "$OpenBSD: elf.c,v 1.16 2007/02/08 03:50:49 ray Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -447,16 +447,13 @@ elf_symloadx(const char *name, FILE *fp, off_t foff, Elf_Ehdr *eh, *pstabsize = shdr[i].sh_size; if (*pstabsize > SIZE_T_MAX) { warnx("%s: corrupt file", name); - free(shstr); return (1); } MMAP(stab, *pstabsize, PROT_READ, MAP_PRIVATE|MAP_FILE, fileno(fp), foff + shdr[i].sh_offset); - if (stab == MAP_FAILED) { - free(shstr); + if (stab == MAP_FAILED) return (1); - } } } for (i = 0; i < eh->e_shnum; i++) { @@ -466,7 +463,6 @@ elf_symloadx(const char *name, FILE *fp, off_t foff, Elf_Ehdr *eh, warn("%s: fseeko", name); if (stab) MUNMAP(stab, *pstabsize); - free(shstr); return (1); } @@ -475,17 +471,13 @@ elf_symloadx(const char *name, FILE *fp, off_t foff, Elf_Ehdr *eh, warn("%s: malloc names", name); if (stab) MUNMAP(stab, *pstabsize); - free(*pnames); - free(shstr); return (1); } if ((*psnames = malloc(*pnrawnames * sizeof(np))) == NULL) { warn("%s: malloc snames", name); if (stab) MUNMAP(stab, *pstabsize); - free(shstr); free(*pnames); - free(*psnames); return (1); } @@ -495,7 +487,6 @@ elf_symloadx(const char *name, FILE *fp, off_t foff, Elf_Ehdr *eh, warn("%s: read symbol", name); if (stab) MUNMAP(stab, *pstabsize); - free(shstr); free(*pnames); free(*psnames); return (1); |