diff options
Diffstat (limited to 'src/common/module.cc')
-rw-r--r-- | src/common/module.cc | 19 |
1 files changed, 15 insertions, 4 deletions
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<ExternSet::iterator,bool> 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<ExternSet::iterator,bool> 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; } } |