From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LSE2B-0008FL-9m for qemu-devel@nongnu.org; Wed, 28 Jan 2009 12:17:03 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LSE28-0008Er-0b for qemu-devel@nongnu.org; Wed, 28 Jan 2009 12:17:01 -0500 Received: from [199.232.76.173] (port=51135 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LSE27-0008Ea-G7 for qemu-devel@nongnu.org; Wed, 28 Jan 2009 12:16:59 -0500 Received: from savannah.gnu.org ([199.232.41.3]:57058 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LSE27-0003PF-5L for qemu-devel@nongnu.org; Wed, 28 Jan 2009 12:16:59 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1LSE25-0007xN-Kd for qemu-devel@nongnu.org; Wed, 28 Jan 2009 17:16:58 +0000 Received: from malc by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1LSE25-0007xJ-2b for qemu-devel@nongnu.org; Wed, 28 Jan 2009 17:16:57 +0000 MIME-Version: 1.0 Errors-To: malc Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: malc Message-Id: Date: Wed, 28 Jan 2009 17:16:57 +0000 Subject: [Qemu-devel] [6466] Fix qemu_malloc. Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 6466 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6466 Author: malc Date: 2009-01-28 17:16:56 +0000 (Wed, 28 Jan 2009) Log Message: ----------- Fix qemu_malloc. make {linux,bsd}-user qemu_realloc handle ptr == NULL correctly. spotted by malc. Modified Paths: -------------- trunk/bsd-user/mmap.c trunk/linux-user/mmap.c Modified: trunk/bsd-user/mmap.c =================================================================== --- trunk/bsd-user/mmap.c 2009-01-27 19:15:31 UTC (rev 6465) +++ trunk/bsd-user/mmap.c 2009-01-28 17:16:56 UTC (rev 6466) @@ -127,6 +127,8 @@ size_t old_size, copy; void *new_ptr; + if (!ptr) + return qemu_malloc(size); old_size = *(size_t *)((char *)ptr - 16); copy = old_size < size ? old_size : size; new_ptr = qemu_malloc(size); Modified: trunk/linux-user/mmap.c =================================================================== --- trunk/linux-user/mmap.c 2009-01-27 19:15:31 UTC (rev 6465) +++ trunk/linux-user/mmap.c 2009-01-28 17:16:56 UTC (rev 6466) @@ -128,6 +128,8 @@ size_t old_size, copy; void *new_ptr; + if (!ptr) + return qemu_malloc(size); old_size = *(size_t *)((char *)ptr - 16); copy = old_size < size ? old_size : size; new_ptr = qemu_malloc(size);