dnrops
/
clang
mirror of https://github.com/microsoft/clang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check pointer null-ness before dereferencing it. 

-Warc-repeated-use-of-weak may trigger a segmentation fault when the Decl
being checked is outside of a function scope, leaving the current function
info pointer null.  This adds a check before using the function info.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@333471 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Richard Trieu 2018-05-29 22:43:00 +00:00
parent 77a37b6cca
commit 67a7d38746
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Sema/SemaDecl.cpp
View File

@ -10799,11 +10799,12 @@ void Sema::AddInitializerToDecl(Decl *RealDecl, Expr *Init, bool DirectInit) {
// we do not warn to warn spuriously when 'x' and 'y' are on separate // we do not warn to warn spuriously when 'x' and 'y' are on separate
// paths through the function. This should be revisited if // paths through the function. This should be revisited if
// -Wrepeated-use-of-weak is made flow-sensitive. // -Wrepeated-use-of-weak is made flow-sensitive.
if ((VDecl->getType().getObjCLifetime() == Qualifiers::OCL_Strong || if (FunctionScopeInfo *FSI = getCurFunction())
VDecl->getType().isNonWeakInMRRWithObjCWeak(Context)) && if ((VDecl->getType().getObjCLifetime() == Qualifiers::OCL_Strong ||
!Diags.isIgnored(diag::warn_arc_repeated_use_of_weak, VDecl->getType().isNonWeakInMRRWithObjCWeak(Context)) &&
Init->getLocStart())) !Diags.isIgnored(diag::warn_arc_repeated_use_of_weak,
getCurFunction()->markSafeWeakUse(Init); Init->getLocStart()))
FSI->markSafeWeakUse(Init);
} }
// The initialization is usually a full-expression. // The initialization is usually a full-expression.

3
test/SemaObjC/arc-repeated-weak.mm
View File

@ -479,3 +479,6 @@ void foo1() {
// expected-error@-2{{cast of 'E' to 'INTFPtrTy' (aka 'INTF *') is disallowed with ARC}} // expected-error@-2{{cast of 'E' to 'INTFPtrTy' (aka 'INTF *') is disallowed with ARC}}
#endif #endif
} }
@class NSString;
static NSString* const kGlobal = @"";