From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59145) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv6UX-0006a4-VZ for qemu-devel@nongnu.org; Tue, 15 Jan 2013 08:23:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tv6UU-0003dk-2Q for qemu-devel@nongnu.org; Tue, 15 Jan 2013 08:23:49 -0500 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:37942) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv6UT-0003bp-Ro for qemu-devel@nongnu.org; Tue, 15 Jan 2013 08:23:45 -0500 Received: from blackfin.pond.sub.org (p5B32AEB8.dip.t-dialin.net [91.50.174.184]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 495089FE64 for ; Tue, 15 Jan 2013 14:23:41 +0100 (CET) From: Markus Armbruster Date: Tue, 15 Jan 2013 14:23:37 +0100 Message-Id: <1358256220-5460-2-git-send-email-armbru@redhat.com> In-Reply-To: <1358256220-5460-1-git-send-email-armbru@redhat.com> References: <1358256220-5460-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 1/4] 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: kwolf@redhat.com, pbonzini@redhat.com, stefanha@redhat.com 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 --- 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.7.11.7