@@ -127,11 +127,11 @@
 	self = [super init];
 
 	@try {
 		void *pool = objc_autoreleasePoolPush();
 		const char *path;
-		char **argv;
+		char **argv, **env = NULL;
 
 		_pid = -1;
 		_readPipe[0] = _writePipe[1] = -1;
 
 		if (pipe(_readPipe) != 0 || pipe(_writePipe) != 0)
@@ -142,12 +142,11 @@
 		[self of_getArgv: &argv
 		  forProgramName: programName
 		    andArguments: arguments];
 
 		@try {
-			char **env = [self
-			    of_environmentForDictionary: environment];
+			env = [self of_environmentForDictionary: environment];
 #ifdef HAVE_POSIX_SPAWNP
 			posix_spawn_file_actions_t actions;
 			posix_spawnattr_t attr;
 
 			if (posix_spawn_file_actions_init(&actions) != 0)
@@ -204,13 +203,20 @@
 			if (_pid == -1)
 				@throw [OFInitializationFailedException
 				    exceptionWithClass: self.class];
 #endif
 		} @finally {
+			char **iter;
+
 			close(_readPipe[1]);
 			close(_writePipe[0]);
-			[self freeMemory: argv];
+			free(argv);
+
+			for (iter = env; *iter != NULL; iter++)
+				free(*iter);
+
+			free(env);
 		}
 
 		objc_autoreleasePoolPop(pool);
 	} @catch (id e) {
 		[self release];
@@ -234,12 +240,11 @@
 {
 	OFString *const *objects = arguments.objects;
 	size_t i, count = arguments.count;
 	of_string_encoding_t encoding;
 
-	*argv = [self allocMemoryWithSize: sizeof(char *)
-				    count: count + 2];
+	*argv = of_malloc(count + 2, sizeof(char *));
 
 	encoding = [OFLocale encoding];
 
 	(*argv)[0] = (char *)[programName cStringWithEncoding: encoding];
 
@@ -250,48 +255,55 @@
 	(*argv)[i + 1] = NULL;
 }
 
 - (char **)of_environmentForDictionary: (OFDictionary *)environment
 {
-	OFEnumerator *keyEnumerator, *objectEnumerator;
 	char **envp;
-	size_t i, count;
+	size_t count;
 	of_string_encoding_t encoding;
 
 	if (environment == nil)
 		return NULL;
 
 	encoding = [OFLocale encoding];
 
 	count = environment.count;
-	envp = [self allocMemoryWithSize: sizeof(char *)
-				   count: count + 1];
-
-	keyEnumerator = [environment keyEnumerator];
-	objectEnumerator = [environment objectEnumerator];
-
-	for (i = 0; i < count; i++) {
-		OFString *key;
-		OFString *object;
-		size_t keyLen, objectLen;
-
-		key = [keyEnumerator nextObject];
-		object = [objectEnumerator nextObject];
-
-		keyLen = [key cStringLengthWithEncoding: encoding];
-		objectLen = [object cStringLengthWithEncoding: encoding];
-
-		envp[i] = [self allocMemoryWithSize: keyLen + objectLen + 2];
-
-		memcpy(envp[i], [key cStringWithEncoding: encoding], keyLen);
-		envp[i][keyLen] = '=';
-		memcpy(envp[i] + keyLen + 1,
-		    [object cStringWithEncoding: encoding], objectLen);
-		envp[i][keyLen + objectLen + 1] = '\0';
-	}
-
-	envp[i] = NULL;
+	envp = of_calloc(count + 1, sizeof(char *));
+
+	@try {
+		OFEnumerator *keyEnumerator = [environment keyEnumerator];
+		OFEnumerator *objectEnumerator = [environment objectEnumerator];
+
+		for (size_t i = 0; i < count; i++) {
+			OFString *key;
+			OFString *object;
+			size_t keyLen, objectLen;
+
+			key = [keyEnumerator nextObject];
+			object = [objectEnumerator nextObject];
+
+			keyLen = [key cStringLengthWithEncoding: encoding];
+			objectLen = [object
+			    cStringLengthWithEncoding: encoding];
+
+			envp[i] = of_malloc(keyLen + objectLen + 2, 1);
+
+			memcpy(envp[i],
+			    [key cStringWithEncoding: encoding], keyLen);
+			envp[i][keyLen] = '=';
+			memcpy(envp[i] + keyLen + 1,
+			    [object cStringWithEncoding: encoding], objectLen);
+			envp[i][keyLen + objectLen + 1] = '\0';
+		}
+	} @catch (id e) {
+		for (size_t i = 0; i < count; i++)
+			free(envp[i]);
+
+		free(envp);
+
+		@throw e;
+	}
 
 	return envp;
 }
 
 - (bool)lowlevelIsAtEndOfStream