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

clang-10 requires the use of 'override'

Browse Source 
Discovered during gitlab auto-build for https://github.com/upx/upx/issues/595
	modified:   Makefile
	modified:   p_armpe.h
	modified:   p_djgpp2.h
	modified:   p_lx_elf.h
	modified:   p_lx_exc.h
	modified:   p_lx_interp.h
	modified:   p_lx_sh.h
	modified:   p_mach.h
	modified:   p_ps1.h
	modified:   p_tmt.h
	modified:   p_unix.h
	modified:   p_vmlinx.h
	modified:   p_vmlinz.h
	modified:   p_w32pe.h
	modified:   p_w64pep.h
	modified:   pefile.h
This commit is contained in:
John Reiser
2022-09-26 16:31:49 -07:00
committed by Markus F.X.J. Oberhumer
parent 2cfa4c1eb7
commit ec33109b22
12 changed files with 456 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_lx_sh.h
+11 -11
View File
@@ -44,25 +44,25 @@ class PackLinuxI386sh : public PackLinuxI386
public:
PackLinuxI386sh(InputFile *f);
virtual ~PackLinuxI386sh();
virtual int getVersion() const { return 13; }
virtual int getFormat() const { return UPX_F_LINUX_SH_i386; }
virtual const char *getName() const { return "linux.sh/i386"; }
virtual const char *getFullName(const options_t *) const { return "i386-linux.elf.shell"; }
virtual const int *getFilters() const { return nullptr; }
virtual void buildLoader(const Filter *);
virtual int getVersion() const override { return 13; }
virtual int getFormat() const override { return UPX_F_LINUX_SH_i386; }
virtual const char *getName() const override { return "linux.sh/i386"; }
virtual const char *getFullName(const options_t *) const override { return "i386-linux.elf.shell"; }
virtual const int *getFilters() const override { return nullptr; }
virtual void buildLoader(const Filter *) override;
virtual void pack1(OutputFile *fo, Filter &ft);
virtual off_t pack3(OutputFile *fo, Filter &ft);
virtual void pack1(OutputFile *fo, Filter &ft) override;
virtual off_t pack3(OutputFile *fo, Filter &ft) override;
virtual bool canPack();
virtual bool canPack() override;
// virtual void unpack(OutputFile *fo) { super::unpack(fo); }
virtual bool canUnpackVersion(int version) const
virtual bool canUnpackVersion(int version) const override
{ return (version >= 11); }
protected:
virtual bool getShellName(char *buf);
virtual void patchLoader();
virtual void patchLoader() override;
int o_shname; // offset to name_of_shell
int l_shname; // length of name_of_shell