From 0d33f17d7705249d28c30c32878cd1841cf88be4 Mon Sep 17 00:00:00 2001 From: midipix Date: Wed, 30 Nov 2016 23:08:42 -0500 Subject: struct pe_{raw|meta}_opt_hdr_dirs: member name normalization. --- src/logic/pe_get_image_meta.c | 8 ++++---- src/reader/pe_read_optional_header.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/logic/pe_get_image_meta.c b/src/logic/pe_get_image_meta.c index f3c0dac..d329727 100644 --- a/src/logic/pe_get_image_meta.c +++ b/src/logic/pe_get_image_meta.c @@ -221,7 +221,7 @@ int pe_get_image_meta( /* .edata */ i = pe_get_named_section_index(m,".edata"); - s = pe_get_block_section_index(m,&m->opt.dirs.export_tbl); + s = pe_get_block_section_index(m,&m->opt.dirs.coh_export_tbl); if ((i >= 0) && (i != s)) return pe_free_image_meta_impl( @@ -230,7 +230,7 @@ int pe_get_image_meta( if (s >= 0) { m->hedata = &m->sectbl[s]; m->aedata = (struct pe_raw_export_hdr *)(base + m->sectbl[s].ptr_to_raw_data - + m->opt.dirs.export_tbl.dh_rva - m->sectbl[s].virtual_addr); + + m->opt.dirs.coh_export_tbl.dh_rva - m->sectbl[s].virtual_addr); } else if (i >= 0) { m->hedata = &m->sectbl[i]; m->aedata = (struct pe_raw_export_hdr *)(base + m->sectbl[i].ptr_to_raw_data); @@ -246,7 +246,7 @@ int pe_get_image_meta( union pe_raw_import_lookup * pitem; i = pe_get_named_section_index(m,".idata"); - s = pe_get_block_section_index(m,&m->opt.dirs.import_tbl); + s = pe_get_block_section_index(m,&m->opt.dirs.coh_import_tbl); if ((i >= 0) && (i != s)) return pe_free_image_meta_impl( @@ -255,7 +255,7 @@ int pe_get_image_meta( if (s >= 0) { m->hidata = &m->sectbl[s]; m->aidata = (struct pe_raw_import_hdr *)(base + m->sectbl[s].ptr_to_raw_data - + m->opt.dirs.import_tbl.dh_rva - m->sectbl[s].virtual_addr); + + m->opt.dirs.coh_import_tbl.dh_rva - m->sectbl[s].virtual_addr); } else if (i >= 0) { m->hidata = &m->sectbl[i]; m->aidata = (struct pe_raw_import_hdr *)(base + m->sectbl[i].ptr_to_raw_data); diff --git a/src/reader/pe_read_optional_header.c b/src/reader/pe_read_optional_header.c index 1b32d95..0c6c302 100644 --- a/src/reader/pe_read_optional_header.c +++ b/src/reader/pe_read_optional_header.c @@ -89,7 +89,7 @@ static int pe_read_optional_header_structs(const union pe_raw_opt_hdr * p, struc memset(&m->dirs,0,sizeof(m->dirs)); mark = p->opt_hdr_64.export_tbl; - pdir = &m->dirs.export_tbl; + pdir = &m->dirs.coh_export_tbl; for (i=0; ildr.coh_rva_and_sizes; i++) { pdir[i].dh_rva = pe_read_long(&mark[i*8]); -- cgit v1.2.3