pe_get_image_meta(): fix (cross-size/platform) logic for reading import items.

3 files changed, 34 insertions, 8 deletions

diff --git a/include/perk/perk.h b/include/perk/perk.h
index 0eed0a3..e35b8ad 100644
--- a/include/perk/perk.h
+++ b/include/perk/perk.h
@@ -257,7 +257,7 @@ perk_api int  pe_read_import_header     (const struct pe_raw_import_hdr *,
 perk_api int  pe_read_coff_symbol       (const struct pe_raw_coff_symbol *,     struct pe_meta_coff_symbol *,
                                          const struct pe_meta_coff_file_hdr *,  void * base);
 
-perk_api int  pe_read_import_lookup     (const union  pe_raw_import_lookup *,   struct pe_meta_import_lookup *,
+perk_api int  pe_read_import_lookup     (const unsigned char *,                 struct pe_meta_import_lookup *,
                                          uint32_t magic);
 
 /* package info */
diff --git a/src/logic/pe_get_image_meta.c b/src/logic/pe_get_image_meta.c
index f554870..1ab5eb8 100644
--- a/src/logic/pe_get_image_meta.c
+++ b/src/logic/pe_get_image_meta.c
@@ -399,7 +399,8 @@ int pe_get_image_meta(
 
 	/* .idata */
 	struct pe_raw_import_hdr * 	pidata;
-	union  pe_raw_import_lookup *	pitem;
+	unsigned char *			pitem;
+	size_t				psize;
 
 	i = pe_get_named_section_index(m,".idata");
 	s = pe_get_block_section_index(m,&m->m_opt.oh_dirs.coh_import_tbl);
@@ -444,17 +445,42 @@ int pe_get_image_meta(
 
 			/* items */
 			if (m->m_idata[i].ih_import_lookup_tbl_rva) {
-				for (pitem = m->m_idata[i].ih_aitems; pe_read_long(pitem->ii_import_lookup_entry_32); pitem++)
-					m->m_idata[i].ih_count++;
+				if (m->m_opt.oh_std.coh_magic == PE_MAGIC_PE32) {
+					pitem = m->m_idata[i].ih_aitems->ii_import_lookup_entry_32;
+
+					for (; pe_read_long(pitem); m->m_idata[i].ih_count++)
+						pitem += sizeof(uint32_t);
+				} else if (m->m_opt.oh_std.coh_magic == PE_MAGIC_PE32_PLUS) {
+					pitem = m->m_idata[i].ih_aitems->ii_import_lookup_entry_64;
+
+					for (; pe_read_quad(pitem); m->m_idata[i].ih_count++)
+						pitem += sizeof(uint64_t);
+				} else {
+					return pe_free_image_meta_impl(
+						m,PERK_CUSTOM_ERROR(
+							dctx,PERK_ERR_UNSUPPORTED_ABI));
+				}
 
 				if (!(m->m_idata[i].ih_items = calloc(m->m_idata[i].ih_count,sizeof(*(m->m_idata[i].ih_items)))))
 					return pe_free_image_meta_impl(
 						m,PERK_SYSTEM_ERROR(dctx));
 			}
 
+			switch (m->m_opt.oh_std.coh_magic) {
+				case PE_MAGIC_PE32:
+					pitem = m->m_idata[i].ih_aitems->ii_import_lookup_entry_32;
+					psize = sizeof(uint32_t);
+					break;
+
+				case PE_MAGIC_PE32_PLUS:
+					pitem = m->m_idata[i].ih_aitems->ii_import_lookup_entry_64;
+					psize = sizeof(uint64_t);
+					break;
+			}
+
 			for (j=0; j<m->m_idata[i].ih_count; j++) {
 				if ((ret = pe_read_import_lookup(
-						&(m->m_idata[i].ih_aitems[j]),
+						pitem + j*psize,
 						&(m->m_idata[i].ih_items[j]),
 						m->m_opt.oh_std.coh_magic)))
 					return pe_free_image_meta_impl(
diff --git a/src/reader/pe_read_import_header.c b/src/reader/pe_read_import_header.c
index cc212af..d76577f 100644
--- a/src/reader/pe_read_import_header.c
+++ b/src/reader/pe_read_import_header.c
@@ -25,18 +25,18 @@ int pe_read_import_header(const struct pe_raw_import_hdr * p, struct pe_meta_imp
 }
 
 int pe_read_import_lookup(
-	const union pe_raw_import_lookup * p,
+	const unsigned char * p,
 	struct pe_meta_import_lookup * m,
 	uint32_t magic)
 {
 	switch (magic) {
 		case PE_MAGIC_PE32:
-			m->u.ii_import_lookup_entry_64 = pe_read_long(p->ii_import_lookup_entry_32);
+			m->u.ii_import_lookup_entry_64 = pe_read_long(p);
 			m->ii_flag = (uint32_t)m->u.ii_import_lookup_entry_64 >> 31;
 			break;
 
 		case PE_MAGIC_PE32_PLUS:
-			m->u.ii_import_lookup_entry_64 = pe_read_quad(p->ii_import_lookup_entry_64);
+			m->u.ii_import_lookup_entry_64 = pe_read_quad(p);
 			m->ii_flag = m->u.ii_import_lookup_entry_64 >> 63;
 			break;