Don't call memset if malloc returns a null pointer

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16797 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/runtime/GCCLibraries/libc/memory.c b/runtime/GCCLibraries/libc/memory.c
index 64aef89094a4d5e03358f7f420808fc5d5740cae..ebca404d488172305ab453de1f01f0a5240d2c78 100644 (file)
--- a/runtime/GCCLibraries/libc/memory.c
+++ b/runtime/GCCLibraries/libc/memory.c
@@ -28,5 +28,6 @@ void *calloc(size_t nelem, size_t elsize) __ATTRIBUTE_WEAK__;
 
 void *calloc(size_t nelem, size_t elsize) {
   void *Result = malloc(nelem*elsize);
-  return memset(Result, 0, nelem*elsize);
+  if (Result) memset(Result, 0, nelem*elsize);
+  return Result;
 }