diff options
| -rw-r--r-- | clang-tools-extra/clang-tidy/google/MemsetZeroLengthCheck.cpp | 3 | ||||
| -rw-r--r-- | clang-tools-extra/test/clang-tidy/google-memset-zero-length.cpp | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/clang-tools-extra/clang-tidy/google/MemsetZeroLengthCheck.cpp b/clang-tools-extra/clang-tidy/google/MemsetZeroLengthCheck.cpp index 98c6246b836..b9b776e0b5c 100644 --- a/clang-tools-extra/clang-tidy/google/MemsetZeroLengthCheck.cpp +++ b/clang-tools-extra/clang-tidy/google/MemsetZeroLengthCheck.cpp @@ -63,7 +63,8 @@ void MemsetZeroLengthCheck::check(const MatchFinder::MatchResult &Result) { return; // If both arguments evaluate to zero emit a warning without fix suggestions. - if (Arg1->EvaluateAsInt(Value1, *Result.Context) && Value1 == 0) { + if (Arg1->EvaluateAsInt(Value1, *Result.Context) && + (Value1 == 0 || Value1.isNegative())) { diag(Call->getLocStart(), "memset of size zero"); return; } diff --git a/clang-tools-extra/test/clang-tidy/google-memset-zero-length.cpp b/clang-tools-extra/test/clang-tidy/google-memset-zero-length.cpp index 5b2327148e1..b5393bdb5e7 100644 --- a/clang-tools-extra/test/clang-tidy/google-memset-zero-length.cpp +++ b/clang-tools-extra/test/clang-tidy/google-memset-zero-length.cpp @@ -49,5 +49,9 @@ void foo(void *a, int xsize, int ysize) { // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: memset of size zero // CHECK-FIXES: memset(a, v, 0); + memset(a, -1, v); +// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: memset of size zero +// CHECK-FIXES: memset(a, -1, v); + memtmpl<0>(); } |
