From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57634) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T49YU-0003af-JY for qemu-devel@nongnu.org; Wed, 22 Aug 2012 07:57:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T49YN-0004Pi-Jn for qemu-devel@nongnu.org; Wed, 22 Aug 2012 07:57:02 -0400 Received: from mx.meyering.net ([88.168.87.75]:45316 helo=hx.meyering.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T49YN-0004PY-8H for qemu-devel@nongnu.org; Wed, 22 Aug 2012 07:56:55 -0400 From: Jim Meyering Date: Wed, 22 Aug 2012 13:55:56 +0200 Message-Id: <1345636556-29008-6-git-send-email-jim@meyering.net> In-Reply-To: <1345636556-29008-1-git-send-email-jim@meyering.net> References: <1345636556-29008-1-git-send-email-jim@meyering.net> Subject: [Qemu-devel] [PATCHv3 5/5] softmmu-semi: fix lock_user* functions not to deref NULL upon OOM List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jim Meyering From: Jim Meyering Return NULL upon malloc failure. Signed-off-by: Jim Meyering --- softmmu-semi.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/softmmu-semi.h b/softmmu-semi.h index 648cb95..bcb979a 100644 --- a/softmmu-semi.h +++ b/softmmu-semi.h @@ -40,7 +40,7 @@ static void *softmmu_lock_user(CPUArchState *env, uint32_t addr, uint32_t len, uint8_t *p; /* TODO: Make this something that isn't fixed size. */ p = malloc(len); - if (copy) + if (p && copy) cpu_memory_rw_debug(env, addr, p, len, 0); return p; } @@ -52,6 +52,9 @@ static char *softmmu_lock_user_string(CPUArchState *env, uint32_t addr) uint8_t c; /* TODO: Make this something that isn't fixed size. */ s = p = malloc(1024); + if (!s) { + return NULL; + } do { cpu_memory_rw_debug(env, addr, &c, 1, 0); addr++; -- 1.7.12