diff options
| author | Alex Shlyapnikov <alekseys@google.com> | 2017-06-29 21:54:36 +0000 |
|---|---|---|
| committer | Alex Shlyapnikov <alekseys@google.com> | 2017-06-29 21:54:36 +0000 |
| commit | db318dfe3724c49f4a628715745799bc7e63e6f5 (patch) | |
| tree | eb37fb82bff7c6ec6773ae1a65258f6eedc410cd /lib/tsan | |
| parent | 9bf4394e71e00bc967ee620b51ba17ead8d23dbc (diff) | |
Merge
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@306746 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/tsan')
| -rw-r--r-- | lib/tsan/rtl/tsan_mman.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tsan/rtl/tsan_mman.cc b/lib/tsan/rtl/tsan_mman.cc index fa0d0cafe..7169d5b02 100644 --- a/lib/tsan/rtl/tsan_mman.cc +++ b/lib/tsan/rtl/tsan_mman.cc @@ -162,7 +162,7 @@ void *user_alloc(ThreadState *thr, uptr pc, uptr sz, uptr align, bool signal) { } void *user_calloc(ThreadState *thr, uptr pc, uptr size, uptr n) { - if (CallocShouldReturnNullDueToOverflow(size, n)) + if (CheckForCallocOverflow(size, n)) return Allocator::FailureHandler::OnBadRequest(); void *p = user_alloc(thr, pc, n * size); if (p) |