diff options
| author | midipix <writeonce@midipix.org> | 2024-02-06 20:43:10 +0000 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2024-02-07 03:50:47 +0000 |
| commit | 4223c83c4bb6ea3aeee68f1810ca86a8fb785f86 (patch) | |
| tree | dcc2c7bcd01a840d6ba75bd3c63f842e2f4c4d58 /src/arbits/slbt_armap_bsd_32.c | |
| parent | 8a77f66005f77d9f8173c1e646ff521517d9c452 (diff) | |
| download | slibtool-4223c83c4bb6ea3aeee68f1810ca86a8fb785f86.tar.bz2 slibtool-4223c83c4bb6ea3aeee68f1810ca86a8fb785f86.tar.xz | |
slbt_get_archive_meta(): bsd symrefs vector: fix ar_name_offset logic.
Diffstat (limited to 'src/arbits/slbt_armap_bsd_32.c')
| -rw-r--r-- | src/arbits/slbt_armap_bsd_32.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/arbits/slbt_armap_bsd_32.c b/src/arbits/slbt_armap_bsd_32.c index ed236b6..f41c500 100644 --- a/src/arbits/slbt_armap_bsd_32.c +++ b/src/arbits/slbt_armap_bsd_32.c @@ -118,13 +118,22 @@ int slbt_ar_parse_primary_armap_bsd_32( mark = armap->ar_first_name_offset; symrefs = m->armaps.armap_symrefs_32; - for (idx=0,uch=*++mark; idx<nsyms; idx++,uch=*++mark) { + for (idx=0; idx<nsyms; idx++) { + uch = *mark++; + + uref = (attr == AR_ARMAP_ATTR_BE_32) + ? (uch[0] << 24) + (uch[1] << 16) + (uch[2] << 8) + uch[3] + : (uch[3] << 24) + (uch[2] << 16) + (uch[1] << 8) + uch[0]; + + symrefs[idx].ar_name_offset = uref; + + uch = *mark++; + uref = (attr == AR_ARMAP_ATTR_BE_32) ? (uch[0] << 24) + (uch[1] << 16) + (uch[2] << 8) + uch[3] : (uch[3] << 24) + (uch[2] << 16) + (uch[1] << 8) + uch[0]; symrefs[idx].ar_member_offset = uref; - mark++; } armap->ar_string_table = m->symstrv; |