@@ -777,14 +777,11 @@
 	}
 # endif
 #endif
 
 	pageSize = [OFSystemInfo pageSize];
-	if ((buffer = malloc(pageSize)) == NULL)
-		@throw [OFOutOfMemoryException
-		    exceptionWithRequestedSize: pageSize];
-
+	buffer = of_malloc(1, pageSize);
 	@try {
 #ifndef OF_WINDOWS
 		if (strftime(buffer, pageSize, format.UTF8String, &tm) == 0)
 			@throw [OFOutOfRangeException exception];
 
@@ -795,11 +792,11 @@
 			@throw [OFOutOfRangeException exception];
 
 		ret = [OFString stringWithUTF16String: buffer];
 #endif
 	} @finally {
-		free(buffer);
+		of_free(buffer);
 	}
 
 	return ret;
 }
 
@@ -840,14 +837,11 @@
 	}
 # endif
 #endif
 
 	pageSize = [OFSystemInfo pageSize];
-	if ((buffer = malloc(pageSize)) == NULL)
-		@throw [OFOutOfMemoryException
-		    exceptionWithRequestedSize: pageSize];
-
+	buffer = of_malloc(1, pageSize);
 	@try {
 #ifndef OF_WINDOWS
 		if (strftime(buffer, pageSize, format.UTF8String, &tm) == 0)
 			@throw [OFOutOfRangeException exception];
 
@@ -858,11 +852,11 @@
 			@throw [OFOutOfRangeException exception];
 
 		ret = [OFString stringWithUTF16String: buffer];
 #endif
 	} @finally {
-		free(buffer);
+		of_free(buffer);
 	}
 
 	return ret;
 }