@@ -240,11 +240,11 @@
 {
 	OFString *const *objects = arguments.objects;
 	size_t i, count = arguments.count;
 	of_string_encoding_t encoding;
 
-	*argv = of_malloc(count + 2, sizeof(char *));
+	*argv = of_alloc(count + 2, sizeof(char *));
 
 	encoding = [OFLocale encoding];
 
 	(*argv)[0] = (char *)[programName cStringWithEncoding: encoding];
 
@@ -265,11 +265,11 @@
 		return NULL;
 
 	encoding = [OFLocale encoding];
 
 	count = environment.count;
-	envp = of_calloc(count + 1, sizeof(char *));
+	envp = of_alloc_zeroed(count + 1, sizeof(char *));
 
 	@try {
 		OFEnumerator *keyEnumerator = [environment keyEnumerator];
 		OFEnumerator *objectEnumerator = [environment objectEnumerator];
 
@@ -283,11 +283,11 @@
 
 			keyLen = [key cStringLengthWithEncoding: encoding];
 			objectLen = [object
 			    cStringLengthWithEncoding: encoding];
 
-			envp[i] = of_malloc(keyLen + objectLen + 2, 1);
+			envp[i] = of_alloc(keyLen + objectLen + 2, 1);
 
 			memcpy(envp[i],
 			    [key cStringWithEncoding: encoding], keyLen);
 			envp[i][keyLen] = '=';
 			memcpy(envp[i] + keyLen + 1,