Loading...
src/dyldNew.cpp dyld-551.4 dyld-421.1
--- dyld/dyld-551.4/src/dyldNew.cpp
+++ dyld/dyld-421.1/src/dyldNew.cpp
@@ -126,20 +126,18 @@
 
 void* calloc(size_t count, size_t size)
 {
-    // Check for overflow of integer multiplication
-    size_t total = count * size;
-    if ( total/count != size ) {
-        dyld::log("dyld calloc overflow: count=%zu, size=%zu\n", count, size);
-        dyld::halt("dyld calloc overflow");
-    }
 	if ( dyld::gLibSystemHelpers != NULL ) {
-		void* result = dyld::gLibSystemHelpers->malloc(total);
-        if ( result != NULL )
-		    bzero(result, total);
+		void* result = dyld::gLibSystemHelpers->malloc(size*count);
+		bzero(result, size*count);
 		return result;
 	}
 	else {
-        // this allocates out of static buffer which is already zero filled
+		// Check for overflow of integer multiplication
+		size_t total = count * size;
+		if ( total/count != size ) {
+			dyld::log("dyld calloc overflow: count=%zu, size=%zu\n", count, size);
+			exit(1);
+		}
 		return malloc(total);
 	}
 }