From 1f3f88c2a5ae86bfe910ff7760a57d9b8396ccb4 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Sun, 28 Jan 2024 16:17:45 +0000
Subject: slbt_get_archive_meta(): symrefs vector: validate all member offsets.

---
 src/arbits/slbt_archive_meta.c | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'src/arbits')

diff --git a/src/arbits/slbt_archive_meta.c b/src/arbits/slbt_archive_meta.c
index 0aebbe3..75de64d 100644
--- a/src/arbits/slbt_archive_meta.c
+++ b/src/arbits/slbt_archive_meta.c
@@ -1238,6 +1238,9 @@ int slbt_get_archive_meta(
 		}
 	}
 
+	/* number of archive members, including internal ones */
+	m->nentries = nentries;
+
 	/* primary armap (first linker member) */
 	if (slbt_ar_parse_primary_armap(dctx,m) < 0)
 		return slbt_free_archive_meta_impl(
@@ -1252,15 +1255,30 @@ int slbt_get_archive_meta(
 	if (m->armaps.armap_common_32.ar_member) {
 		symrefs_32 = m->armaps.armap_symrefs_32;
 
-		for (idx=0; idx<m->armaps.armap_nsyms; idx++)
+		for (idx=0; idx<m->armaps.armap_nsyms; idx++) {
 			symrefs_32[idx].ar_name_offset = m->symstrv[idx] - m->symstrv[0];
+
+			if (!slbt_archive_member_from_offset(m,symrefs_32[idx].ar_member_offset))
+				return slbt_free_archive_meta_impl(
+					m,SLBT_CUSTOM_ERROR(
+						dctx,
+						SLBT_ERR_AR_INVALID_ARMAP_MEMBER_OFFSET));
+
+		}
 	}
 
 	if (m->armaps.armap_common_64.ar_member) {
 		symrefs_64 = m->armaps.armap_symrefs_64;
 
-		for (idx=0; idx<m->armaps.armap_nsyms; idx++)
+		for (idx=0; idx<m->armaps.armap_nsyms; idx++) {
 			symrefs_64[idx].ar_name_offset = m->symstrv[idx] - m->symstrv[0];
+
+			if (!slbt_archive_member_from_offset(m,symrefs_64[idx].ar_member_offset))
+				return slbt_free_archive_meta_impl(
+					m,SLBT_CUSTOM_ERROR(
+						dctx,
+						SLBT_ERR_AR_INVALID_ARMAP_MEMBER_OFFSET));
+		}
 	}
 
 	/* number of public archive members */
@@ -1282,9 +1300,6 @@ int slbt_get_archive_meta(
 	if (m->armaps.armap_common_64.ar_member)
 		m->armaps.armap_common_64.ar_num_of_members = nmembers;
 
-	/* number of archive members, including internal ones */
-	m->nentries = nentries;
-
 	/* pe/coff armap attributes (second linker member) */
 	(void)m->armeta.a_armap_pecoff;
 
-- 
cgit v1.2.3