[PATCH] D45115: [analyzer] Fix assertion crash in CStringChecker
George Karpenkov via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Fri Mar 30 18:23:08 PDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rC328912: [analyzer] Fix assertion crash in CStringChecker (authored by george.karpenkov, committed by ).
Herald added a subscriber: cfe-commits.
Repository:
rC Clang
https://reviews.llvm.org/D45115
Files:
lib/StaticAnalyzer/Checkers/CStringChecker.cpp
test/Analysis/string.c
Index: test/Analysis/string.c
===================================================================
--- test/Analysis/string.c
+++ test/Analysis/string.c
@@ -30,6 +30,7 @@
void clang_analyzer_eval(int);
int scanf(const char *restrict format, ...);
+void *memcpy(void *, const void *, unsigned long);
//===----------------------------------------------------------------------===
// strlen()
@@ -1173,6 +1174,7 @@
clang_analyzer_eval(strlen(dst) >= 4); // expected-warning{{UNKNOWN}}
}
+
// The analyzer_eval call below should evaluate to true. Most likely the same
// issue as the test above.
void strncpy_exactly_matching_buffer2(char *y) {
@@ -1185,3 +1187,12 @@
// This time, we know that y fits in x anyway.
clang_analyzer_eval(strlen(x) <= 3); // expected-warning{{UNKNOWN}}
}
+
+struct S {
+ char f;
+};
+
+void nocrash_on_locint_offset(void *addr, void* from, struct S s) {
+ int iAdd = (int) addr;
+ memcpy(((void *) &(s.f)), from, iAdd);
+}
Index: lib/StaticAnalyzer/Checkers/CStringChecker.cpp
===================================================================
--- lib/StaticAnalyzer/Checkers/CStringChecker.cpp
+++ lib/StaticAnalyzer/Checkers/CStringChecker.cpp
@@ -395,8 +395,10 @@
// Compute the offset of the last element to be accessed: size-1.
NonLoc One = svalBuilder.makeIntVal(1, sizeTy).castAs<NonLoc>();
- NonLoc LastOffset = svalBuilder
- .evalBinOpNN(state, BO_Sub, *Length, One, sizeTy).castAs<NonLoc>();
+ SVal Offset = svalBuilder.evalBinOpNN(state, BO_Sub, *Length, One, sizeTy);
+ if (Offset.isUnknown())
+ return nullptr;
+ NonLoc LastOffset = Offset.castAs<NonLoc>();
// Check that the first buffer is sufficiently long.
SVal BufStart = svalBuilder.evalCast(BufVal, PtrTy, FirstBuf->getType());
@@ -862,9 +864,10 @@
// Compute the offset of the last element to be accessed: size-1.
NonLoc One = svalBuilder.makeIntVal(1, sizeTy).castAs<NonLoc>();
- NonLoc LastOffset =
- svalBuilder.evalBinOpNN(state, BO_Sub, *Length, One, sizeTy)
- .castAs<NonLoc>();
+ SVal Offset = svalBuilder.evalBinOpNN(state, BO_Sub, *Length, One, sizeTy);
+ if (Offset.isUnknown())
+ return true; // cf top comment
+ NonLoc LastOffset = Offset.castAs<NonLoc>();
// Check that the first buffer is sufficiently long.
SVal BufStart = svalBuilder.evalCast(BufVal, PtrTy, FirstBuf->getType());
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D45115.140517.patch
Type: text/x-patch
Size: 2384 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20180331/ba670168/attachment-0001.bin>
More information about the cfe-commits
mailing list