
Summary: A few changes related to logging: - prepend `Scudo` to the error messages so that users can identify that we reported an error; - replace a couple of `Report` calls in the RSS check code with `dieWithMessage`/`Print`, mark a condition as `UNLIKELY` in the process; - change some messages so that they all look more or less the same. This includes the `CHECK` message; - adapt a couple of tests with the new strings. A couple of side notes: this results in a few 1-line-blocks, for which I left brackets. There doesn't seem to be any style guide for that, I can remove them if need be. I didn't use `SanitizerToolName` in the strings, but directly `Scudo` because we are the only users, I could change that too. Reviewers: alekseyshl, flowerhack Reviewed By: alekseyshl Subscribers: mgorny, delcypher, llvm-commits, #sanitizers Differential Revision: https://reviews.llvm.org/D44171 llvm-svn: 326901
42 lines
1.3 KiB
C++
42 lines
1.3 KiB
C++
// RUN: %clangxx_scudo -fsized-deallocation %s -o %t
|
|
// RUN: %env_scudo_opts=DeleteSizeMismatch=1 %run %t gooddel 2>&1
|
|
// RUN: %env_scudo_opts=DeleteSizeMismatch=1 not %run %t baddel 2>&1 | FileCheck %s
|
|
// RUN: %env_scudo_opts=DeleteSizeMismatch=0 %run %t baddel 2>&1
|
|
// RUN: %env_scudo_opts=DeleteSizeMismatch=1 %run %t gooddelarr 2>&1
|
|
// RUN: %env_scudo_opts=DeleteSizeMismatch=1 not %run %t baddelarr 2>&1 | FileCheck %s
|
|
// RUN: %env_scudo_opts=DeleteSizeMismatch=0 %run %t baddelarr 2>&1
|
|
|
|
// Ensures that the sized delete operator errors out when the appropriate
|
|
// option is passed and the sizes do not match between allocation and
|
|
// deallocation functions.
|
|
|
|
#include <assert.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include <new>
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
assert(argc == 2);
|
|
if (!strcmp(argv[1], "gooddel")) {
|
|
long long *p = new long long;
|
|
operator delete(p, sizeof(long long));
|
|
}
|
|
if (!strcmp(argv[1], "baddel")) {
|
|
long long *p = new long long;
|
|
operator delete(p, 2);
|
|
}
|
|
if (!strcmp(argv[1], "gooddelarr")) {
|
|
char *p = new char[64];
|
|
operator delete[](p, 64);
|
|
}
|
|
if (!strcmp(argv[1], "baddelarr")) {
|
|
char *p = new char[63];
|
|
operator delete[](p, 64);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
// CHECK: ERROR: invalid sized delete when deallocating address
|