From: Stefan Weil <sw@weilnetz.de>
Date: Tue, 4 Sep 2012 20:14:19 +0000 (+0200)
Subject: linux-user: Remove redundant null check and replace free by g_free
X-Git-Tag: v1.2.1~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61dea8e914440d02720a929ad78178ed821f9946;p=thirdparty%2Fqemu.git

linux-user: Remove redundant null check and replace free by g_free

Report from smatch:

linux-user/syscall.c:3632 do_ioctl_dm(220) info:
 redundant null check on big_buf calling free()

'big_buf' was allocated by g_malloc0, therefore free was also
replaced by g_free.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
(cherry picked from commit ad11ad77748bdd8016370db210751683dc038dd6)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 6257a04d0a9..471d0605f7a 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -3628,9 +3628,7 @@ static abi_long do_ioctl_dm(const IOCTLEntry *ie, uint8_t *buf_temp, int fd,
         unlock_user(argptr, arg, target_size);
     }
 out:
-    if (big_buf) {
-        free(big_buf);
-    }
+    g_free(big_buf);
     return ret;
 }