From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33105) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv9hG-0002y0-KI for qemu-devel@nongnu.org; Tue, 15 Jan 2013 11:49:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tv9hC-0005mM-By for qemu-devel@nongnu.org; Tue, 15 Jan 2013 11:49:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42217) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv9hC-0005lO-3Y for qemu-devel@nongnu.org; Tue, 15 Jan 2013 11:49:06 -0500 From: Stefan Hajnoczi Date: Tue, 15 Jan 2013 17:48:28 +0100 Message-Id: <1358268511-27061-13-git-send-email-stefanha@redhat.com> In-Reply-To: <1358268511-27061-1-git-send-email-stefanha@redhat.com> References: <1358268511-27061-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 12/15] w32: Make qemu_vfree() accept NULL like the POSIX implementation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Markus Armbruster , Stefan Hajnoczi From: Markus Armbruster On POSIX, qemu_vfree() accepts NULL, because it's merely wrapper around free(). As far as I can tell, the Windows implementation doesn't. Breeds bugs that bite only under Windows. Make the Windows implementation behave like the POSIX implementation. Signed-off-by: Markus Armbruster Reviewed-by: Kevin Wolf Signed-off-by: Stefan Hajnoczi --- util/oslib-win32.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/util/oslib-win32.c b/util/oslib-win32.c index e7e283e..640194c 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -71,7 +71,9 @@ void *qemu_vmalloc(size_t size) void qemu_vfree(void *ptr) { trace_qemu_vfree(ptr); - VirtualFree(ptr, 0, MEM_RELEASE); + if (ptr) { + VirtualFree(ptr, 0, MEM_RELEASE); + } } /* FIXME: add proper locking */ -- 1.8.0.2