gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a potential null dereference.

Browse Source 
The bug was discovered by running runarray1 test in runtime_cxxmodules mode.
This commit is contained in:
Vassil Vassilev 2018-10-05 23:00:29 +02:00 committed by sftnight
parent 9c7abadde0
commit 8b925f1c64
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/MetaProcessor/Display.cpp
View File

@ -1123,7 +1123,10 @@ void GlobalsPrinter::DisplayGlobals()const
//Try to print global macro definitions (object-like only).
const Preprocessor& pp = compiler->getPreprocessor();
for (macro_iterator macro = pp.macro_begin(); macro != pp.macro_end(); ++macro) {
auto MI = macro->second.getLatest()->getMacroInfo();
auto* MD = macro->second.getLatest();
if (!MD)
continue;
auto MI = MD->getMacroInfo();
if (MI && MI->isObjectLike())
DisplayObjectLikeMacro(macro->first, MI);
}
@ -1168,7 +1171,10 @@ void GlobalsPrinter::DisplayGlobal(const std::string& name)const
Interpreter::PushTransactionRAII RAII(const_cast<Interpreter*>(fInterpreter));
const Preprocessor& pp = compiler->getPreprocessor();
for (macro_iterator macro = pp.macro_begin(); macro != pp.macro_end(); ++macro) {
auto MI = macro->second.getLatest()->getMacroInfo();
auto* MD = macro->second.getLatest();
if (!MD)
continue;
auto MI = MD->getMacroInfo();
if (MI && MI->isObjectLike()) {
if (name == macro->first->getName().data()) {
DisplayObjectLikeMacro(macro->first, MI);