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

Use upx_uint32_t, upx_uint64_t

Browse Source 
Avoid complaints from x86_64-w64-mingw32-gcc (GCC) 9.3-win32 20200320
https://github.com/upx/upx/issues/545
	modified:   p_mach.h
This commit is contained in:
John Reiser 2021-12-27 08:33:54 -08:00 committed by Markus F.X.J. Oberhumer
parent 2d6987252e
commit fcdf0e92c1
1 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
src/p_mach.h
View File

@ -1313,105 +1313,105 @@ protected:
// (Fie on fuzzers!) // (Fie on fuzzers!)
struct dyld_info_command { struct dyld_info_command {
uint32_t cmd; upx_uint32_t cmd;
uint32_t cmdsize; upx_uint32_t cmdsize;
uint32_t rebase_off; upx_uint32_t rebase_off;
uint32_t rebase_size; upx_uint32_t rebase_size;
uint32_t bind_off; upx_uint32_t bind_off;
uint32_t bind_size; upx_uint32_t bind_size;
uint32_t weak_bind_off; upx_uint32_t weak_bind_off;
uint32_t weak_bind_size; upx_uint32_t weak_bind_size;
uint32_t lazy_bind_off; upx_uint32_t lazy_bind_off;
uint32_t lazy_bind_size; upx_uint32_t lazy_bind_size;
uint32_t export_off; upx_uint32_t export_off;
uint32_t export_size; upx_uint32_t export_size;
}; };
union lc_str { union lc_str {
uint32_t offset; upx_uint32_t offset;
}; };
struct dylib { struct dylib {
union lc_str name; union lc_str name;
uint32_t timestamp; upx_uint32_t timestamp;
uint32_t current_version; upx_uint32_t current_version;
uint32_t compatibility_version; upx_uint32_t compatibility_version;
}; };
struct dylib_command { struct dylib_command {
uint32_t cmd; upx_uint32_t cmd;
uint32_t cmdsize; upx_uint32_t cmdsize;
struct dylib dylib; struct dylib dylib;
}; };
struct dylinker_command { struct dylinker_command {
uint32_t cmd; upx_uint32_t cmd;
uint32_t cmdsize; upx_uint32_t cmdsize;
union lc_str name; union lc_str name;
}; };
struct encryption_info_command { struct encryption_info_command {
uint32_t cmd; upx_uint32_t cmd;
uint32_t cmdsize; upx_uint32_t cmdsize;
uint32_t cryptoff; upx_uint32_t cryptoff;
uint32_t cryptsize; upx_uint32_t cryptsize;
uint32_t cryptid; upx_uint32_t cryptid;
}; };
struct encryption_info_command_64 { struct encryption_info_command_64 {
uint32_t cmd; upx_uint32_t cmd;
uint32_t cmdsize; upx_uint32_t cmdsize;
uint32_t cryptoff; upx_uint32_t cryptoff;
uint32_t cryptsize; upx_uint32_t cryptsize;
uint32_t cryptid; upx_uint32_t cryptid;
uint32_t pad; upx_uint32_t pad;
}; };
struct entry_point_command { struct entry_point_command {
uint32_t cmd; upx_uint32_t cmd;
uint32_t cmdsize; upx_uint32_t cmdsize;
uint64_t entryoff; upx_uint64_t entryoff;
uint64_t stacksize; upx_uint64_t stacksize;
}; };
struct linkedit_data_command { struct linkedit_data_command {
uint32_t cmd; upx_uint32_t cmd;
uint32_t cmdsize; upx_uint32_t cmdsize;
uint32_t dataoff; upx_uint32_t dataoff;
uint32_t datasize; upx_uint32_t datasize;
}; };
struct rpath_command { struct rpath_command {
uint32_t cmd; upx_uint32_t cmd;
uint32_t cmdsize; upx_uint32_t cmdsize;
union lc_str path; union lc_str path;
}; };
struct routines_command { struct routines_command {
uint32_t cmd; upx_uint32_t cmd;
uint32_t cmdsize; upx_uint32_t cmdsize;
uint32_t init_address; upx_uint32_t init_address;
uint32_t init_module; upx_uint32_t init_module;
uint32_t reserved1; upx_uint32_t reserved1;
uint32_t reserved2; upx_uint32_t reserved2;
uint32_t reserved3; upx_uint32_t reserved3;
uint32_t reserved4; upx_uint32_t reserved4;
uint32_t reserved5; upx_uint32_t reserved5;
uint32_t reserved6; upx_uint32_t reserved6;
}; };
struct routines_command_64 { struct routines_command_64 {
uint32_t cmd; upx_uint32_t cmd;
uint32_t cmdsize; upx_uint32_t cmdsize;
uint64_t init_address; upx_uint64_t init_address;
uint64_t init_module; upx_uint64_t init_module;
uint64_t reserved1; upx_uint64_t reserved1;
uint64_t reserved2; upx_uint64_t reserved2;
uint64_t reserved3; upx_uint64_t reserved3;
uint64_t reserved4; upx_uint64_t reserved4;
uint64_t reserved5; upx_uint64_t reserved5;
uint64_t reserved6; upx_uint64_t reserved6;
}; };
struct uuid_command { struct uuid_command {
uint32_t cmd; upx_uint32_t cmd;
uint32_t cmdsize; upx_uint32_t cmdsize;
uint8_t uuid[16]; uint8_t uuid[16];
}; };
struct version_min_command { struct version_min_command {
uint32_t cmd; upx_uint32_t cmd;
uint32_t cmdsize; upx_uint32_t cmdsize;
uint32_t version; upx_uint32_t version;
uint32_t sdk; upx_uint32_t sdk;
}; };
#endif /* already included */ #endif /* already included */