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

fix bad merge

Browse Source 
p_lx_elf.h p_lx_exc.cpp

committer: jreiser <jreiser> 1108944786 +0000
This commit is contained in:
John Reiser
2005-02-21 00:13:06 +00:00
parent 14b0527e79
commit dfaf3f24fc
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_lx_elf.h
+1 -1
View File
@@ -123,7 +123,7 @@ class PackLinuxElf32ppc : public PackLinuxElf32Be
public: public:
PackLinuxElf32ppc(InputFile *f); PackLinuxElf32ppc(InputFile *f);
virtual ~PackLinuxElf32ppc(); virtual ~PackLinuxElf32ppc();
virtual int getFormat() const { return UPX_F_LINUX_ELF_PPC; } virtual int getFormat() const { return UPX_F_LINUX_ELFPPC32; }
virtual const char *getName() const { return "linux/ElfPPC"; } virtual const char *getName() const { return "linux/ElfPPC"; }
virtual const int *getFilters() const; virtual const int *getFilters() const;
virtual bool canPack(); virtual bool canPack();
src/p_lx_exc.cpp
+3 -3
View File
@@ -156,6 +156,8 @@ PackLinuxI386::pack4(OutputFile *fo, Filter &ft)
(elfout.ehdr.e_phentsize * elfout.ehdr.e_phnum) + (elfout.ehdr.e_phentsize * elfout.ehdr.e_phnum) +
sizeof(l_info) + sizeof(l_info) +
((elfout.ehdr.e_phnum==3) ? (unsigned) elfout.phdr[2].p_memsz : 0) ; ((elfout.ehdr.e_phnum==3) ? (unsigned) elfout.phdr[2].p_memsz : 0) ;
unsigned len = fo->getBytesWritten();
set_native32(&elfout.phdr[0].p_filesz, len);
super::pack4(fo, ft); // write PackHeader and overlay_offset super::pack4(fo, ft); // write PackHeader and overlay_offset
@@ -218,9 +220,7 @@ PackLinuxI386::pack4(OutputFile *fo, Filter &ft)
// rewrite Elf header // rewrite Elf header
fo->seek(0, SEEK_SET); fo->seek(0, SEEK_SET);
fo->rewrite(&elfout, sizeof(elfout.ehdr) + fo->rewrite(&elfout, overlay_offset);
elfout.ehdr.e_phnum * sizeof(elfout.phdr[0]) +
sizeof(l_info) );
} }
static unsigned static unsigned