mirrors/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-23 10:54:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

libbacktrace: correctly swap Mach-O 32-bit file offset

Browse Source 
libbacktrace/ChangeLog:
	PR libbacktrace/96973
	* macho.c (macho_add_fat): Correctly swap 32-bit file offset.
This commit is contained in:
Ian Lance Taylor 2020-09-08 13:16:44 -07:00
parent 651c61c3ce
commit 488e33339e
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libbacktrace/macho.c
View File

@ -793,13 +793,24 @@ macho_add_fat (struct backtrace_state *state, const char *filename,
for (i = 0; i < nfat_arch; ++i) for (i = 0; i < nfat_arch; ++i)
{ {
struct macho_fat_arch_64 fat_arch;
uint32_t fcputype; uint32_t fcputype;
uint64_t foffset;
if (is_64) if (is_64)
memcpy (&fat_arch, {
(const char *) arch_view.data + i * arch_size, struct macho_fat_arch_64 fat_arch_64;
arch_size);
memcpy (&fat_arch_64,
(const char *) arch_view.data + i * arch_size,
arch_size);
fcputype = fat_arch_64.cputype;
foffset = fat_arch_64.offset;
if (swapped)
{
fcputype = __builtin_bswap32 (fcputype);
foffset = __builtin_bswap64 (foffset);
}
}
else else
{ {
struct macho_fat_arch fat_arch_32; struct macho_fat_arch fat_arch_32;
@ -807,26 +818,18 @@ macho_add_fat (struct backtrace_state *state, const char *filename,
memcpy (&fat_arch_32, memcpy (&fat_arch_32,
(const char *) arch_view.data + i * arch_size, (const char *) arch_view.data + i * arch_size,
arch_size); arch_size);
fat_arch.cputype = fat_arch_32.cputype; fcputype = fat_arch_32.cputype;
fat_arch.cpusubtype = fat_arch_32.cpusubtype; foffset = (uint64_t) fat_arch_32.offset;
fat_arch.offset = (uint64_t) fat_arch_32.offset; if (swapped)
fat_arch.size = (uint64_t) fat_arch_32.size; {
fat_arch.align = fat_arch_32.align; fcputype = __builtin_bswap32 (fcputype);
fat_arch.reserved = 0; foffset = (uint64_t) __builtin_bswap32 ((uint32_t) foffset);
}
} }
fcputype = fat_arch.cputype;
if (swapped)
fcputype = __builtin_bswap32 (fcputype);
if (fcputype == cputype) if (fcputype == cputype)
{ {
uint64_t foffset;
/* FIXME: What about cpusubtype? */ /* FIXME: What about cpusubtype? */
foffset = fat_arch.offset;
if (swapped)
foffset = __builtin_bswap64 (foffset);
backtrace_release_view (state, &arch_view, error_callback, data); backtrace_release_view (state, &arch_view, error_callback, data);
return macho_add (state, filename, descriptor, foffset, match_uuid, return macho_add (state, filename, descriptor, foffset, match_uuid,
base_address, skip_symtab, error_callback, data, base_address, skip_symtab, error_callback, data,