From dfaf3f24fc40062875632a0061a3c78c0bcf75e2 Mon Sep 17 00:00:00 2001 From: John Reiser Date: Mon, 21 Feb 2005 00:13:06 +0000 Subject: [PATCH] fix bad merge p_lx_elf.h p_lx_exc.cpp committer: jreiser 1108944786 +0000 --- src/p_lx_elf.h | 2 +- src/p_lx_exc.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/p_lx_elf.h b/src/p_lx_elf.h index bd00eac2..18865278 100644 --- a/src/p_lx_elf.h +++ b/src/p_lx_elf.h @@ -123,7 +123,7 @@ class PackLinuxElf32ppc : public PackLinuxElf32Be public: PackLinuxElf32ppc(InputFile *f); 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 int *getFilters() const; virtual bool canPack(); diff --git a/src/p_lx_exc.cpp b/src/p_lx_exc.cpp index 354bee7f..efc45cb2 100644 --- a/src/p_lx_exc.cpp +++ b/src/p_lx_exc.cpp @@ -156,6 +156,8 @@ PackLinuxI386::pack4(OutputFile *fo, Filter &ft) (elfout.ehdr.e_phentsize * elfout.ehdr.e_phnum) + sizeof(l_info) + ((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 @@ -218,9 +220,7 @@ PackLinuxI386::pack4(OutputFile *fo, Filter &ft) // rewrite Elf header fo->seek(0, SEEK_SET); - fo->rewrite(&elfout, sizeof(elfout.ehdr) + - elfout.ehdr.e_phnum * sizeof(elfout.phdr[0]) + - sizeof(l_info) ); + fo->rewrite(&elfout, overlay_offset); } static unsigned