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

Fix a few things spotted by the gcc-6 sanitizer. Needs review.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer 2016-09-21 00:35:51 +02:00
parent ffa0efc898
commit 1bb0fa1809
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/linker.cpp
View File

@ -69,7 +69,8 @@ ElfLinker::Section::Section(const char *n, const void *i, unsigned s, unsigned a
assert(name != NULL); assert(name != NULL);
input = malloc(s + 1); input = malloc(s + 1);
assert(input != NULL); assert(input != NULL);
memcpy(input, i, s); if (s != 0)
memcpy(input, i, s);
((char *)input)[s] = 0; ((char *)input)[s] = 0;
} }

6
src/p_lx_elf.cpp
View File

@ -230,6 +230,7 @@ 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);
file_image = New(char, len); 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);
@ -237,6 +238,7 @@ PackLinuxElf32::PackLinuxElf32help1(InputFile *f)
} }
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);
file_image = New(char, file_size); 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);
@ -600,6 +602,7 @@ 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);
file_image = New(char, len); 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);
@ -607,6 +610,7 @@ PackLinuxElf64::PackLinuxElf64help1(InputFile *f)
} }
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);
file_image = New(char, file_size); 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);
@ -1662,6 +1666,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);
file_image = New(char, file_size); 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);
@ -1837,6 +1842,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);
file_image = New(char, file_size); 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);

2
src/p_unix.cpp
View File

@ -325,7 +325,7 @@ void PackUnix::packExtent(
} }
fi->seek(x.offset, SEEK_SET); fi->seek(x.offset, SEEK_SET);
for (off_t rest = x.size; 0 != rest; ) { for (off_t rest = x.size; 0 != rest; ) {
int const filter_strategy = getStrategy(*ft); int const filter_strategy = ft ? getStrategy(*ft) : 0;
int l = fi->readx(ibuf, UPX_MIN(rest, (off_t)blocksize)); int l = fi->readx(ibuf, UPX_MIN(rest, (off_t)blocksize));
if (l == 0) { if (l == 0) {
break; break;