Skip to content

Commit 71aae8d

Browse files
committed
[analyzer] Fix nullptr dereference for symbols from pointer invalidation
As reported in llvm#105648 (comment) commit 08ad8dc7154bf3ab79f750e6d5fb7df597c7601a introduced a nullptr dereference in the case when store contains a binding to a symbol that has no origin region associated with it, such as the symbol generated when a pointer is passed to an opaque function.
1 parent 8ae877a commit 71aae8d

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

clang/lib/StaticAnalyzer/Checkers/StackAddrEscapeChecker.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,10 @@ static const MemSpaceRegion *getStackOrGlobalSpaceRegion(const MemRegion *R) {
308308
const MemRegion *getOriginBaseRegion(const MemRegion *Reg) {
309309
Reg = Reg->getBaseRegion();
310310
while (const auto *SymReg = dyn_cast<SymbolicRegion>(Reg)) {
311-
Reg = SymReg->getSymbol()->getOriginRegion()->getBaseRegion();
311+
const auto* OriginReg = SymReg->getSymbol()->getOriginRegion();
312+
if (!OriginReg)
313+
break;
314+
Reg = OriginReg->getBaseRegion();
312315
}
313316
return Reg;
314317
}

clang/test/Analysis/stack-addr-ps.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,3 +126,22 @@ void caller_for_nested_leaking() {
126126
int *ptr = 0;
127127
caller_mid_for_nested_leaking(&ptr);
128128
}
129+
130+
// This used to crash StackAddrEscapeChecker because
131+
// it features a symbol conj_$1{struct c *, LC1, S763, #1}
132+
// that has no origin region.
133+
// bbi-98571
134+
struct a {
135+
int member;
136+
};
137+
138+
struct c {
139+
struct a *nested_ptr;
140+
};
141+
long global_var;
142+
void opaque(struct c*);
143+
void bbi_98571_no_crash() {
144+
struct c *ptr = (struct c *)global_var;
145+
opaque(ptr);
146+
ptr->nested_ptr->member++;
147+
}

0 commit comments

Comments
 (0)