Serene
/
include-what-you-use
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check for nullptr before calling member function 

Calling a member function on a nullpointer object is Undefined
Behaviour. When IWYU was compiled with -Os it crashed with a segmentation
fault due to the compiler exploiting this UB for performance reasons.

This patch simply checks current_ast_node_ for nullptr before calling
member functions.

Fixes include-what-you-use/include-what-you-use#767
This commit is contained in:
Emil Gedda 2020-03-09 22:37:01 +01:00 committed by Kim Gräsman
parent 709d224968
commit e3645e77f9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
iwyu.cc
View File

@ -327,7 +327,7 @@ class BaseAstVisitor : public RecursiveASTVisitor<Derived> {
void set_current_ast_node(ASTNode* an) { current_ast_node_ = an; }
bool TraverseDecl(Decl* decl) {
if (current_ast_node_->StackContainsContent(decl))
if (current_ast_node_ && current_ast_node_->StackContainsContent(decl))
return true; // avoid recursion
ASTNode node(decl, *GlobalSourceManager());
CurrentASTNodeUpdater canu(&current_ast_node_, &node);
@ -335,7 +335,7 @@ class BaseAstVisitor : public RecursiveASTVisitor<Derived> {
}
bool TraverseStmt(Stmt* stmt) {
if (current_ast_node_->StackContainsContent(stmt))
if (current_ast_node_ && current_ast_node_->StackContainsContent(stmt))
return true; // avoid recursion
ASTNode node(stmt, *GlobalSourceManager());
CurrentASTNodeUpdater canu(&current_ast_node_, &node);
@ -346,7 +346,7 @@ class BaseAstVisitor : public RecursiveASTVisitor<Derived> {
if (qualtype.isNull())
return Base::TraverseType(qualtype);
const Type* type = qualtype.getTypePtr();
if (current_ast_node_->StackContainsContent(type))
if (current_ast_node_ && current_ast_node_->StackContainsContent(type))
return true; // avoid recursion
ASTNode node(type, *GlobalSourceManager());
CurrentASTNodeUpdater canu(&current_ast_node_, &node);
@ -370,7 +370,7 @@ class BaseAstVisitor : public RecursiveASTVisitor<Derived> {
if (typeloc.getAs<QualifiedTypeLoc>()) {
typeloc = typeloc.getUnqualifiedLoc();
}
if (current_ast_node_->StackContainsContent(&typeloc))
if (current_ast_node_ && current_ast_node_->StackContainsContent(&typeloc))
return true; // avoid recursion
ASTNode node(&typeloc, *GlobalSourceManager());
CurrentASTNodeUpdater canu(&current_ast_node_, &node);