jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix memory leak

Browse Source 
modified:   p_lx_elf.cpp
This commit is contained in:
John Reiser 2016-09-20 20:43:48 -07:00
parent ad6914b938
commit d2830db94d
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/p_lx_elf.cpp
View File

@ -230,16 +230,14 @@ PackLinuxElf32::PackLinuxElf32help1(InputFile *f)
if (f && Elf32_Ehdr::ET_DYN!=e_type) { if (f && Elf32_Ehdr::ET_DYN!=e_type) {
unsigned const len = sz_phdrs + e_phoff; unsigned const len = sz_phdrs + e_phoff;
assert(file_image == NULL); assert(file_image != NULL); // set by PackLinuxElf64help1
file_image = New(char, len);
f->seek(0, SEEK_SET); f->seek(0, SEEK_SET);
f->readx(file_image, len); f->readx(file_image, len);
phdri= (Elf32_Phdr *)(e_phoff + file_image); // do not free() !! phdri= (Elf32_Phdr *)(e_phoff + file_image); // do not free() !!
} }
if (f && Elf32_Ehdr::ET_DYN==e_type) { if (f && Elf32_Ehdr::ET_DYN==e_type) {
// The DT_STRTAB has no designated length. Read the whole file. // The DT_STRTAB has no designated length. Read the whole file.
assert(file_image == NULL); assert(file_image != NULL); // set by PackLinuxElf64help1
file_image = New(char, file_size);
f->seek(0, SEEK_SET); f->seek(0, SEEK_SET);
f->readx(file_image, file_size); f->readx(file_image, file_size);
phdri= (Elf32_Phdr *)(e_phoff + file_image); // do not free() !! phdri= (Elf32_Phdr *)(e_phoff + file_image); // do not free() !!
@ -602,16 +600,14 @@ PackLinuxElf64::PackLinuxElf64help1(InputFile *f)
if (f && Elf64_Ehdr::ET_DYN!=e_type) { if (f && Elf64_Ehdr::ET_DYN!=e_type) {
unsigned const len = sz_phdrs + e_phoff; unsigned const len = sz_phdrs + e_phoff;
assert(file_image == NULL); assert(file_image != NULL); // set by PackLinuxElf64help1
file_image = New(char, len);
f->seek(0, SEEK_SET); f->seek(0, SEEK_SET);
f->readx(file_image, len); f->readx(file_image, len);
phdri= (Elf64_Phdr *)(e_phoff + file_image); // do not free() !! phdri= (Elf64_Phdr *)(e_phoff + file_image); // do not free() !!
} }
if (f && Elf64_Ehdr::ET_DYN==e_type) { if (f && Elf64_Ehdr::ET_DYN==e_type) {
// The DT_STRTAB has no designated length. Read the whole file. // The DT_STRTAB has no designated length. Read the whole file.
assert(file_image == NULL); assert(file_image != NULL); // set by PackLinuxElf64help1
file_image = New(char, file_size);
f->seek(0, SEEK_SET); f->seek(0, SEEK_SET);
f->readx(file_image, file_size); f->readx(file_image, file_size);
phdri= (Elf64_Phdr *)(e_phoff + file_image); // do not free() !! phdri= (Elf64_Phdr *)(e_phoff + file_image); // do not free() !!
@ -1666,8 +1662,7 @@ PackLinuxElf64ppcle::canPack()
if (Elf32_Ehdr::ET_DYN==get_te16(&ehdr->e_type)) { if (Elf32_Ehdr::ET_DYN==get_te16(&ehdr->e_type)) {
// The DT_STRTAB has no designated length. Read the whole file. // The DT_STRTAB has no designated length. Read the whole file.
assert(file_image == NULL); assert(file_image != NULL); // set by PackLinuxElf64help1
file_image = New(char, file_size);
fi->seek(0, SEEK_SET); fi->seek(0, SEEK_SET);
fi->readx(file_image, file_size); fi->readx(file_image, file_size);
memcpy(&ehdri, ehdr, sizeof(Elf64_Ehdr)); memcpy(&ehdri, ehdr, sizeof(Elf64_Ehdr));
@ -1842,8 +1837,7 @@ PackLinuxElf64amd::canPack()
if (Elf32_Ehdr::ET_DYN==get_te16(&ehdr->e_type)) { if (Elf32_Ehdr::ET_DYN==get_te16(&ehdr->e_type)) {
// The DT_STRTAB has no designated length. Read the whole file. // The DT_STRTAB has no designated length. Read the whole file.
assert(file_image == NULL); assert(file_image != NULL); // set by PackLinuxElf64help1
file_image = New(char, file_size);
fi->seek(0, SEEK_SET); fi->seek(0, SEEK_SET);
fi->readx(file_image, file_size); fi->readx(file_image, file_size);
memcpy(&ehdri, ehdr, sizeof(Elf64_Ehdr)); memcpy(&ehdri, ehdr, sizeof(Elf64_Ehdr));