diff options
| author | midipix <writeonce@midipix.org> | 2024-01-25 17:53:23 +0000 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2024-01-25 17:53:23 +0000 |
| commit | 5152c7da6315728cbf21fc46c4365004c08a2377 (patch) | |
| tree | 382ffe7e0d2379ce1a1864e9aa9f39ca5f60e5f4 /src/arbits | |
| parent | 80052a218bdc12511f3d59d6bae3e6e1986fe5f1 (diff) | |
| download | slibtool-5152c7da6315728cbf21fc46c4365004c08a2377.tar.bz2 slibtool-5152c7da6315728cbf21fc46c4365004c08a2377.tar.xz | |
slbt_ar_parse_primary_armap_sysv_64(): perform strict armap validation.
Diffstat (limited to 'src/arbits')
| -rw-r--r-- | src/arbits/slbt_archive_meta.c | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/src/arbits/slbt_archive_meta.c b/src/arbits/slbt_archive_meta.c index 0bd0ac7..30fb022 100644 --- a/src/arbits/slbt_archive_meta.c +++ b/src/arbits/slbt_archive_meta.c @@ -527,6 +527,9 @@ static int slbt_ar_parse_primary_armap_sysv_64( uint64_t nsyms_hi; uint64_t nsyms_lo; uint64_t nsyms; + uint64_t nstrs; + const char * ch; + const char * cap; unsigned char * uch; unsigned char (*mark)[0x08]; @@ -546,8 +549,46 @@ static int slbt_ar_parse_primary_armap_sysv_64( nsyms = (nsyms_hi << 32) + nsyms_lo; mark += nsyms; + if (memberp->ar_object_size < (sizeof(*mark) + (nsyms * sizeof(*mark)))) + return SLBT_CUSTOM_ERROR( + dctx, + SLBT_ERR_AR_INVALID_ARMAP_NUMBER_OF_SYMS); + m->symstrs = (const char *)mark; + cap = memberp->ar_object_data; + cap += memberp->ar_object_size; + + if (cap == m->symstrs) + return SLBT_CUSTOM_ERROR( + dctx, + SLBT_ERR_AR_INVALID_ARMAP_STRING_TABLE); + + if (nsyms && !m->symstrs[0]) + return SLBT_CUSTOM_ERROR( + dctx, + SLBT_ERR_AR_INVALID_ARMAP_STRING_TABLE); + + for (ch=&m->symstrs[1],nstrs=0; ch<cap; ch++) { + if (!ch[0] && !ch[-1] && (nstrs < nsyms)) + return SLBT_CUSTOM_ERROR( + dctx, + SLBT_ERR_AR_INVALID_ARMAP_STRING_TABLE); + + if (!ch[0] && ch[-1]) + nstrs++; + } + + if (nstrs != nsyms) + return SLBT_CUSTOM_ERROR( + dctx, + SLBT_ERR_AR_INVALID_ARMAP_STRING_TABLE); + + if (cap[-1]) + return SLBT_CUSTOM_ERROR( + dctx, + SLBT_ERR_AR_INVALID_ARMAP_STRING_TABLE); + if (!(m->symstrv = calloc(nsyms + 1,sizeof(const char *)))) return SLBT_SYSTEM_ERROR(dctx,0); |