5 files changed, 75 insertions, 5 deletions

diff --git a/src/crc/pe_crc32.c b/src/crc/pe_crc32.c
new file mode 100644
index 0000000..a2cfdd5
--- /dev/null
+++ b/src/crc/pe_crc32.c
@@ -0,0 +1,32 @@
+/***************************************************************/
+/*  perk: PE Resource Kit                                      */
+/*  Copyright (C) 2015--2025  SysDeer Technologies, LLC        */
+/*  Released under GPLv2 and GPLv3; see COPYING.PERK.          */
+/***************************************************************/
+
+#include <stdint.h>
+#include <unistd.h>
+
+#include <perk/perk.h>
+#include <perk/perk_crc32.h>
+
+static const uint32_t crc32_table[256] = PERK_CRC32_TABLE;
+
+uint32_t pe_hash_mbstr_crc32(const unsigned char * str, size_t * symlen)
+{
+	const unsigned char *	ch;
+	uint32_t		crc32;
+
+	crc32	= 0 ^ 0xFFFFFFFF;
+	ch	= str;
+
+	while (*ch) {
+		crc32 = (crc32 >> 8) ^ crc32_table[(crc32 ^ *ch) & 0xFF];
+		ch++;
+	}
+
+	if (symlen)
+		*symlen = ch - str;
+
+	return (crc32 ^ 0xFFFFFFFF);
+}
diff --git a/src/crc/pe_crc64.c b/src/crc/pe_crc64.c
new file mode 100644
index 0000000..8296432
--- /dev/null
+++ b/src/crc/pe_crc64.c
@@ -0,0 +1,32 @@
+/***************************************************************/
+/*  perk: PE Resource Kit                                      */
+/*  Copyright (C) 2015--2025  SysDeer Technologies, LLC        */
+/*  Released under GPLv2 and GPLv3; see COPYING.PERK.          */
+/***************************************************************/
+
+#include <stdint.h>
+#include <unistd.h>
+
+#include <perk/perk.h>
+#include <perk/perk_crc64.h>
+
+static const uint64_t crc64_table[256] = PERK_CRC64_TABLE;
+
+uint64_t pe_hash_mbstr_crc64(const unsigned char * str, size_t * symlen)
+{
+	const unsigned char *	ch;
+	uint64_t		crc64;
+
+	crc64	= 0 ^ 0xFFFFFFFFFFFFFFFF;
+	ch	= str;
+
+	while (*ch) {
+		crc64 = (crc64 >> 8) ^ crc64_table[(crc64 ^ *ch) & 0xFF];
+		ch++;
+	}
+
+	if (symlen)
+		*symlen = ch - str;
+
+	return (crc64 ^ 0xFFFFFFFFFFFFFFFF);
+}
diff --git a/src/logic/pe_image_meta_data.c b/src/logic/pe_image_meta_data.c
index 9753487..ad2098e 100644
--- a/src/logic/pe_image_meta_data.c
+++ b/src/logic/pe_image_meta_data.c
@@ -366,11 +366,11 @@ int pe_meta_get_image_meta(
 	}
 
 	mark  = (const unsigned char *)base + m->m_coff.cfh_ptr_to_sym_tbl;
-	mark += m->m_coff.cfh_num_of_syms * sizeof(struct pe_raw_coff_symbol);
+	mark += m->m_coff.cfh_size_of_sym_tbl;
 
 	if (m->m_coff.cfh_ptr_to_sym_tbl) {
 		m->m_coff.cfh_ptr_to_str_tbl  = m->m_coff.cfh_ptr_to_sym_tbl;
-		m->m_coff.cfh_ptr_to_str_tbl += m->m_coff.cfh_num_of_syms * sizeof(struct pe_raw_coff_symbol);
+		m->m_coff.cfh_ptr_to_str_tbl += m->m_coff.cfh_size_of_sym_tbl;
 		m->m_coff.cfh_size_of_str_tbl = pe_read_long(mark);
 	}
 
diff --git a/src/output/pe_output_image_symbols.c b/src/output/pe_output_image_symbols.c
index 6c8f4dc..ca4445c 100644
--- a/src/output/pe_output_image_symbols.c
+++ b/src/output/pe_output_image_symbols.c
@@ -20,6 +20,7 @@ int pe_output_image_symbols(
 	const struct pe_image_meta *	meta)
 {
 	unsigned			i;
+	unsigned                        nrecs;
 	int				fdout;
 	char *				mark;
 	struct pe_raw_coff_symbol *	symtbl;
@@ -27,6 +28,7 @@ int pe_output_image_symbols(
 	const char * 			dash = "";
 
 	fdout = pe_driver_fdout(dctx);
+	nrecs = meta->m_coff.cfh_size_of_sym_tbl / sizeof(struct pe_raw_coff_symbol);
 
 	if (dctx->cctx->fmtflags & PERK_PRETTY_YAML) {
 		if (pe_dprintf(fdout,"symbols:\n") < 0)
@@ -38,7 +40,7 @@ int pe_output_image_symbols(
 	mark   = (char *)meta->r_image.map_addr;
 	symtbl = (struct pe_raw_coff_symbol *)(mark + meta->m_coff.cfh_ptr_to_sym_tbl);
 
-	for (i=0; i<meta->m_coff.cfh_num_of_syms; i++) {
+	for (i=0; i<nrecs; i++) {
 		pe_read_coff_symbol(
 			&symtbl[i],&symrec,
 			&meta->m_coff,meta->r_image.map_addr);
diff --git a/src/reader/pe_read_coff_header.c b/src/reader/pe_read_coff_header.c
index 9894017..032a995 100644
--- a/src/reader/pe_read_coff_header.c
+++ b/src/reader/pe_read_coff_header.c
@@ -28,7 +28,9 @@ int pe_read_coff_header(const struct pe_raw_coff_image_hdr * p, struct pe_meta_c
 
 	m->cfh_time_date_stamp	= pe_read_long(p->cfh_time_date_stamp);
 	m->cfh_ptr_to_sym_tbl	= pe_read_long(p->cfh_ptr_to_sym_tbl);
-	m->cfh_num_of_syms	= pe_read_long(p->cfh_num_of_sym_recs);
+
+	m->cfh_size_of_sym_tbl  = pe_read_long(p->cfh_num_of_sym_recs);
+	m->cfh_size_of_sym_tbl *= sizeof(struct pe_raw_coff_symbol);
 
 	m->cfh_size_of_opt_hdr	= pe_read_short(p->cfh_size_of_opt_hdr);
 	m->cfh_characteristics	= pe_read_short(p->cfh_characteristics);
@@ -99,7 +101,9 @@ int pe_read_object_header(const struct pe_raw_coff_object_hdr * p, struct pe_met
 
 	m->cfh_time_date_stamp	= pe_read_long(p->cfh_time_date_stamp);
 	m->cfh_ptr_to_sym_tbl	= pe_read_long(p->cfh_ptr_to_sym_tbl);
-	m->cfh_num_of_syms	= pe_read_long(p->cfh_num_of_sym_recs);
+
+	m->cfh_size_of_sym_tbl	= pe_read_long(p->cfh_num_of_sym_recs);
+	m->cfh_size_of_sym_tbl *= sizeof(struct pe_raw_coff_symbol);
 
 	m->cfh_size_of_opt_hdr	= pe_read_short(p->cfh_size_of_opt_hdr);
 	m->cfh_characteristics	= pe_read_short(p->cfh_characteristics);