From 8127f56dffb94defc5c5dbf93caf211195ba8aec Mon Sep 17 00:00:00 2001 From: "ted.mielczarek@gmail.com" Date: Mon, 3 Nov 2014 18:25:43 +0000 Subject: Read dynamic symbols table even if binary contains debug info A=Wander Lairson Costa . R=ted at https://breakpad.appspot.com/9684002/ git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1400 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/common/module.cc | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'src/common/module.cc') diff --git a/src/common/module.cc b/src/common/module.cc index 244fc988..9a8e64cf 100644 --- a/src/common/module.cc +++ b/src/common/module.cc @@ -98,10 +98,21 @@ void Module::AddStackFrameEntry(StackFrameEntry *stack_frame_entry) { } void Module::AddExtern(Extern *ext) { - std::pair ret = externs_.insert(ext); - if (!ret.second) { - // Free the duplicate that was not inserted because this Module - // now owns it. + Function func; + func.name = ext->name; + func.address = ext->address; + + // Since parsing debug section and public info are not necessarily + // mutually exclusive, check if the symbol has already been read + // as a function to avoid duplicates. + if (functions_.find(&func) == functions_.end()) { + std::pair ret = externs_.insert(ext); + if (!ret.second) { + // Free the duplicate that was not inserted because this Module + // now owns it. + delete ext; + } + } else { delete ext; } } -- cgit v1.2.1