1 files changed, 35 insertions, 23 deletions

diff --git a/src/output/pe_output_image_symbols.c b/src/output/pe_output_image_symbols.c
index 6c8f4dc..26269ac 100644
--- a/src/output/pe_output_image_symbols.c
+++ b/src/output/pe_output_image_symbols.c
@@ -1,6 +1,6 @@
 /***************************************************************/
 /*  perk: PE Resource Kit                                      */
-/*  Copyright (C) 2015--2021  SysDeer Technologies, LLC        */
+/*  Copyright (C) 2015--2025  SysDeer Technologies, LLC        */
 /*  Released under GPLv2 and GPLv3; see COPYING.PERK.          */
 /***************************************************************/
 
@@ -15,38 +15,50 @@
 #include "perk_dprintf_impl.h"
 #include "perk_errinfo_impl.h"
 
-int pe_output_image_symbols(
+static int pe_output_symbol_names(
 	const struct pe_driver_ctx *	dctx,
-	const struct pe_image_meta *	meta)
+	const struct pe_image_meta *	meta,
+	int                             fdout)
 {
-	unsigned			i;
-	int				fdout;
-	char *				mark;
-	struct pe_raw_coff_symbol *	symtbl;
-	struct pe_meta_coff_symbol	symrec;
-	const char * 			dash = "";
-
-	fdout = pe_driver_fdout(dctx);
+	struct pe_meta_coff_symbol *	symrec;
 
-	if (dctx->cctx->fmtflags & PERK_PRETTY_YAML) {
-		if (pe_dprintf(fdout,"symbols:\n") < 0)
+	for (symrec=meta->m_symtbl; symrec->cs_name; symrec++)
+		if (pe_dprintf(fdout,"%s\n",symrec->cs_name) < 0)
 			return PERK_FILE_ERROR(dctx);
 
-		dash = "- ";
-	}
+	return 0;
+}
 
-	mark   = (char *)meta->r_image.map_addr;
-	symtbl = (struct pe_raw_coff_symbol *)(mark + meta->m_coff.cfh_ptr_to_sym_tbl);
+static int pe_output_symbol_names_yaml(
+	const struct pe_driver_ctx *	dctx,
+	const struct pe_image_meta *	meta,
+	int                             fdout)
+{
+	struct pe_meta_coff_symbol *	symrec;
 
-	for (i=0; i<meta->m_coff.cfh_num_of_syms; i++) {
-		pe_read_coff_symbol(
-			&symtbl[i],&symrec,
-			&meta->m_coff,meta->r_image.map_addr);
+	if (pe_dprintf(fdout,"  - Symbols:\n") < 0)
+		return PERK_FILE_ERROR(dctx);
 
-		if (pe_dprintf(fdout,"%s%s\n",dash,symrec.cs_name) < 0)
+	for (symrec=meta->m_symtbl; symrec->cs_name; symrec++)
+		if (pe_dprintf(fdout,"    - [ symbol: %s ]\n",symrec->cs_name) < 0)
 			return PERK_FILE_ERROR(dctx);
 
-		i += symtbl[i].cs_num_of_aux_recs[0];
+	return 0;
+}
+
+int pe_output_image_symbols(
+	const struct pe_driver_ctx *	dctx,
+	const struct pe_image_meta *	meta)
+{
+	int fdout = pe_driver_fdout(dctx);
+
+	if (dctx->cctx->fmtflags & PERK_PRETTY_YAML) {
+		if (pe_output_symbol_names_yaml(dctx,meta,fdout) < 0)
+			return PERK_NESTED_ERROR(dctx);
+
+	} else {
+		if (pe_output_symbol_names(dctx,meta,fdout) < 0)
+			return PERK_NESTED_ERROR(dctx);
 	}
 
 	return 0;