@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2008-2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2008-2022 Jonathan Schleifer <js@nil.im>
  *
  * All rights reserved.
  *
  * This file is part of ObjFW. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
@@ -16,10 +16,11 @@
 #include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "unistd_wrapper.h"
 
 #include <assert.h>
 
 #ifdef OF_APPLE_RUNTIME
 # include <dlfcn.h>
@@ -46,11 +47,10 @@
 
 #import "OFAllocFailedException.h"
 #import "OFEnumerationMutationException.h"
 #import "OFInitializationFailedException.h"
 #import "OFInvalidArgumentException.h"
-#import "OFMemoryNotPartOfObjectException.h"
 #import "OFNotImplementedException.h"
 #import "OFOutOfMemoryException.h"
 #import "OFOutOfRangeException.h"
 
 #if defined(OF_APPLE_RUNTIME) && __OBJC2__
@@ -70,11 +70,11 @@
 #ifdef OF_APPLE_RUNTIME
 extern id _Nullable _objc_rootAutorelease(id _Nullable object);
 #endif
 #if defined(OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR)
 extern id OFForward(id, SEL, ...);
-extern struct stret OFForward_stret(id, SEL, ...);
+extern struct Stret OFForward_stret(id, SEL, ...);
 #else
 # define OFForward OFMethodNotFound
 # define OFForward_stret OFMethodNotFound_stret
 #endif
 
@@ -133,12 +133,14 @@
 }
 
 void *
 OFResizeMemory(void *pointer, size_t count, size_t size)
 {
-	if OF_UNLIKELY (count == 0 || size == 0)
+	if OF_UNLIKELY (count == 0 || size == 0) {
+		free(pointer);
 		return NULL;
+	}
 
 	if OF_UNLIKELY (count > SIZE_MAX / size)
 		@throw [OFOutOfRangeException exception];
 
 	if OF_UNLIKELY ((pointer = realloc(pointer, count * size)) == NULL)