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

Fix clang scan-build errors.

Browse Source 
modified:   p_lx_elf.cpp
This commit is contained in:
John Reiser
2016-10-01 17:38:16 -07:00
parent 3534ed21d7
commit 977024ea94
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_lx_elf.cpp
+8 -3
View File
@@ -2159,8 +2159,12 @@ PackNetBSDElf32x86::generateElfHdr(
fo->seek(0, SEEK_SET); fo->seek(0, SEEK_SET);
fo->rewrite(h2, sizeof(*h2) - sizeof(h2->linfo)); fo->rewrite(h2, sizeof(*h2) - sizeof(h2->linfo));
memcpy(&((char *)phdr)[0], np_NetBSD, sz_NetBSD); // The 'if' guards on these two calls to memcpy are required
memcpy(&((char *)phdr)[sz_NetBSD], np_PaX, sz_PaX); // because the C Standard Committee did not debug the Standard
// before publishing. An empty region (0==size) must nevertheless
// have a valid (non-NULL) pointer.
if (sz_NetBSD) memcpy(&((char *)phdr)[0], np_NetBSD, sz_NetBSD);
if (sz_PaX) memcpy(&((char *)phdr)[sz_NetBSD], np_PaX, sz_PaX);
fo->write(&elfout.phdr[2], fo->write(&elfout.phdr[2],
&((char *)phdr)[sz_PaX + sz_NetBSD] - (char *)&elfout.phdr[2]); &((char *)phdr)[sz_PaX + sz_NetBSD] - (char *)&elfout.phdr[2]);
@@ -2367,7 +2371,7 @@ void PackLinuxElf32::pack1(OutputFile *fo, Filter & /*ft*/)
} }
//set the shstrtab //set the shstrtab
sec_strndx = &shdr[ehdri.e_shstrndx]; sec_strndx = &shdri[ehdri.e_shstrndx];
char *strtab = New(char, sec_strndx->sh_size); char *strtab = New(char, sec_strndx->sh_size);
fi->seek(0,SEEK_SET); fi->seek(0,SEEK_SET);
@@ -2404,6 +2408,7 @@ void PackLinuxElf32::pack1(OutputFile *fo, Filter & /*ft*/)
shdri = tmp; shdri = tmp;
delete [] shdr; delete [] shdr;
shdr = NULL; shdr = NULL;
sec_strndx = NULL;
} }
} }
} }