summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
Diffstat (limited to 'llvm')
-rw-r--r--llvm/runtime/GCCLibraries/libc/memory.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/runtime/GCCLibraries/libc/memory.c b/llvm/runtime/GCCLibraries/libc/memory.c
index 64aef89094a..ebca404d488 100644
--- a/llvm/runtime/GCCLibraries/libc/memory.c
+++ b/llvm/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;
}
OpenPOWER on IntegriCloud