1 files changed, 5 insertions, 4 deletions
diff --git a/cpukit/libcsupport/src/calloc.c b/cpukit/libcsupport/src/calloc.c
index 20db533786..78b08ab5a5 100644
--- a/cpukit/libcsupport/src/calloc.c
+++ b/cpukit/libcsupport/src/calloc.c
@@ -28,15 +28,16 @@ void *calloc(
   size_t elsize
 )
 {
-  char   *cptr;
+  void   *cptr;
   size_t  length;
 
   length = nelem * elsize;
   cptr = malloc( length );
   RTEMS_OBFUSCATE_VARIABLE( cptr );
-  if ( cptr )
-    memset( cptr, '\0', length );
+  if ( RTEMS_PREDICT_FALSE( cptr == NULL ) ) {
+    return cptr;
+  }
 
-  return cptr;
+  return memset( cptr, 0, length );
 }
 #endif