commit 346988bf029c5cd1cf57a39442215a912b34d056
author Alex Shlyapnikov <alekseys@google.com> Thu Jun 29 21:54:38 2017 +0000
committer Alex Shlyapnikov <alekseys@google.com> Thu Jun 29 21:54:38 2017 +0000
tree 3691539a8c6e0d9c9bae3702b50f97ec4fa3b1c0
parent cb823f6a1911f8516e6e04830e28c2d4dec61c8d

Merge

llvm-svn: 306748

compiler-rt/lib/scudo/scudo_allocator.cpp

diff --git a/compiler-rt/lib/scudo/scudo_allocator.cpp b/compiler-rt/lib/scudo/scudo_allocator.cpp
index a2a3c8b..00fa192 100644
--- a/compiler-rt/lib/scudo/scudo_allocator.cpp
+++ b/compiler-rt/lib/scudo/scudo_allocator.cpp
@@ -580,8 +580,7 @@
 
   void *calloc(uptr NMemB, uptr Size) {
     initThreadMaybe();
-    // TODO(kostyak): switch to CheckForCallocOverflow once D34799 lands.
-    if (CallocShouldReturnNullDueToOverflow(NMemB, Size))
+    if (CheckForCallocOverflow(NMemB, Size))
       return FailureHandler::OnBadRequest();
     return allocate(NMemB * Size, MinAlignment, FromMalloc, true);
   }