summaryrefslogtreecommitdiff
path: root/src/reader
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2018-11-17 23:43:18 -0500
committermidipix <writeonce@midipix.org>2018-11-20 20:25:17 -0500
commit4ae524cd27c6aa6f95dd62a7e6eb4a02acdfd4d6 (patch)
treedb04d7c14a172ff253e802674f7cee7f2a0342fb /src/reader
parent2bae5fde60d0cad9203b554f36d6724dbc255c30 (diff)
downloadperk-4ae524cd27c6aa6f95dd62a7e6eb4a02acdfd4d6.tar.bz2
perk-4ae524cd27c6aa6f95dd62a7e6eb4a02acdfd4d6.tar.xz
pe_get_image_meta(), pe_read_import_lookup(): follow correct lookup semantics.
Diffstat (limited to 'src/reader')
-rw-r--r--src/reader/pe_read_import_header.c19
1 files changed, 17 insertions, 2 deletions
diff --git a/src/reader/pe_read_import_header.c b/src/reader/pe_read_import_header.c
index 9450ca4..cc212af 100644
--- a/src/reader/pe_read_import_header.c
+++ b/src/reader/pe_read_import_header.c
@@ -32,13 +32,28 @@ int pe_read_import_lookup(
switch (magic) {
case PE_MAGIC_PE32:
m->u.ii_import_lookup_entry_64 = pe_read_long(p->ii_import_lookup_entry_32);
- return 0;
+ 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);
- return 0;
+ m->ii_flag = m->u.ii_import_lookup_entry_64 >> 63;
+ break;
default:
return PERK_ERR_BAD_IMAGE_TYPE;
}
+
+ if (m->ii_flag) {
+ m->ii_ordinal = m->u.ii_import_lookup_entry_32 & 0x7fff;
+ m->ii_hint_name_tbl_rva = 0;
+ } else {
+ m->ii_ordinal = 0;
+ m->ii_hint_name_tbl_rva = m->u.ii_import_lookup_entry_32 & 0x7fffffff;
+ }
+
+ m->ii_hint = 0;
+ m->ii_name = 0;
+
+ return 0;
}