x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 5 Activity

Use correct PDBDiaFile instance.

This commit is contained in:
ZehMatt 2018-02-12 23:02:33 +01:00 committed by Duncan Ogilvie
parent 45b49995f3
commit c8af1f9144
No known key found for this signature in database
GPG Key ID: FC89E0AAA0C1AAD8
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/dbg/symbolsourcedia.cpp
View File

@ -6,7 +6,8 @@
SymbolSourceDIA::SymbolSourceDIA()
: _requiresShutdown(false),
_imageBase(0),
_loadCounter(0)
_loadCounter(0),
_isOpen(false)
{
}
@ -16,11 +17,6 @@ SymbolSourceDIA::~SymbolSourceDIA()
{
cancelLoading();
}
if(_pdb.isOpen())
{
_pdb.close();
}
}
static void SetThreadDescription(std::thread & thread, WString name)
@ -42,10 +38,12 @@ bool SymbolSourceDIA::loadPDB(const std::string & path, duint imageBase, duint i
return false;
}
bool res = _pdb.open(path.c_str(), 0, validationData);
PDBDiaFile pdb; // Instance used for validation only.
_isOpen = pdb.open(path.c_str(), 0, validationData);
#if 1 // Async loading.
if(res)
if(_isOpen)
{
_imageSize = imageSize;
_imageBase = imageBase;
_requiresShutdown = false;
@ -56,12 +54,12 @@ bool SymbolSourceDIA::loadPDB(const std::string & path, duint imageBase, duint i
SetThreadDescription(_symbolsThread, L"SourceLinesThread");
}
#endif
return res;
return _isOpen;
}
bool SymbolSourceDIA::isOpen() const
{
return _pdb.isOpen();
return _isOpen;
}
bool SymbolSourceDIA::isLoading() const
@ -158,7 +156,7 @@ bool SymbolSourceDIA::loadSymbolsAsync(String path)
return true;
};
bool res = _pdb.enumerateLexicalHierarchy(query);
bool res = pdb.enumerateLexicalHierarchy(query);
if(!res)
{
@ -238,7 +236,7 @@ bool SymbolSourceDIA::loadSourceLinesAsync(String path)
std::map<uint64_t, DiaLineInfo_t> lines;
bool res = _pdb.getFunctionLineNumbers(rva, rangeSize, _imageBase, lines);
bool res = pdb.getFunctionLineNumbers(rva, rangeSize, _imageBase, lines);
for(const auto & line : lines)
{
if(_requiresShutdown)
@ -367,9 +365,6 @@ void SymbolSourceDIA::enumSymbols(const CbEnumSymbol & cbEnum)
bool SymbolSourceDIA::findSourceLineInfo(duint rva, LineInfo & lineInfo)
{
if(isOpen() == false)
return false;
ScopedSpinLock lock(_lockLines);
auto it = _lines.find(rva);

3
src/dbg/symbolsourcedia.h
View File

@ -54,8 +54,7 @@ class SymbolSourceDIA : public SymbolSourceBase
};
private:
PDBDiaFile _pdb;
bool _isOpen;
std::vector<SymbolInfo> _symData;
struct AddrIndex