fix issue #59: add DWARF support for symbol to imported data

1 files changed, 21 insertions, 2 deletions

diff --git a/src/PEImage.cpp b/src/PEImage.cpp
index 5808cf9..1f916c2 100644
--- a/src/PEImage.cpp
+++ b/src/PEImage.cpp
@@ -783,14 +783,33 @@ const char* PEImage::findSectionSymbolName(int s) const
         return t_findSectionSymbolName<IMAGE_SYMBOL> (s);

 }

 

-int PEImage::findSymbol(const char* name, unsigned long& off) const

+bool symbolMatches(const char* name, const char* symname, bool& dllimport)

+{

+	if (strcmp(symname, name) == 0)

+		return true;

+	if (symname[0] != '_')

+		return false;

+	if (strcmp(symname + 1, name) == 0)

+		return true;

+

+	if (strncmp(symname + 1, "_imp_", 5) == 0)

+		symname += 6;

+	else

+		return false;

+	if (strcmp(symname, name) != 0 && (symname[0] != '_' || strcmp(symname + 1, name) != 0))

+		return false;

+	dllimport = true;

+	return true;

+}

+

+int PEImage::findSymbol(const char* name, unsigned long& off, bool& dllimport) const

 {

     int sizeof_sym = bigobj ? sizeof(IMAGE_SYMBOL_EX) : IMAGE_SIZEOF_SYMBOL;

 	for(int i = 0; i < nsym; i++)

 	{

 		IMAGE_SYMBOL* sym = (IMAGE_SYMBOL*) (symtable + i * sizeof_sym);

 		const char* symname = sym->N.Name.Short == 0 ? strtable + sym->N.Name.Long : (char*)sym->N.ShortName;

-		if(strcmp(symname, name) == 0 || (symname[0] == '_' && strcmp(symname + 1, name) == 0))

+		if(symbolMatches(name, symname, dllimport))

 		{

 			off = sym->Value;

 			return bigobj ? ((IMAGE_SYMBOL_EX*)sym)->SectionNumber : sym->SectionNumber;