From patchwork Tue Jan 15 14:29:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 212188 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E61B02C00A5 for ; Wed, 16 Jan 2013 01:38:28 +1100 (EST) Received: from localhost ([::1]:59312 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv7Wd-0006OJ-GQ for incoming@patchwork.ozlabs.org; Tue, 15 Jan 2013 09:30:03 -0500 Received: from eggs.gnu.org ([208.118.235.92]:51301) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv7Vp-00044A-Ca for qemu-devel@nongnu.org; Tue, 15 Jan 2013 09:29:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tv7Vn-0006Ub-LZ for qemu-devel@nongnu.org; Tue, 15 Jan 2013 09:29:13 -0500 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:38111) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv7Vn-0006UB-ET for qemu-devel@nongnu.org; Tue, 15 Jan 2013 09:29:11 -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 C6DD59FE59 for ; Tue, 15 Jan 2013 15:29:10 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3268A200AC; Tue, 15 Jan 2013 15:29:10 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 15 Jan 2013 15:29:07 +0100 Message-Id: <1358260150-9760-2-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1358260150-9760-1-git-send-email-armbru@redhat.com> References: <1358260150-9760-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a01:4f8:121:10e4::3 Cc: kwolf@redhat.com, pbonzini@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH v2 1/4] w32: Make qemu_vfree() accept NULL like the POSIX implementation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 */