diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-09-25 16:06:16 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-09-25 16:06:16 -0500 |
| commit | 3988475b9b7fa251b00a29b076761d8c1c7e64dc (patch) | |
| tree | 140c0410e1d8133ddd33e07ad2fc9c2a8d0e824b /linux-user/syscall.c | |
| parent | 97fe81d3e8613be13754ff096c16b73010fd60ad (diff) | |
| parent | 95df51a4a02a853af8828c281bce2d4f2a41d6fd (diff) | |
| download | qemu-3988475b9b7fa251b00a29b076761d8c1c7e64dc.zip qemu-3988475b9b7fa251b00a29b076761d8c1c7e64dc.tar.gz qemu-3988475b9b7fa251b00a29b076761d8c1c7e64dc.tar.bz2 | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches:
w32: Always use standard instead of native format strings
net/socket: Fix compiler warning (regression for MinGW)
linux-user: Remove redundant null check and replace free by g_free
qemu-timer: simplify qemu_run_timers
TextConsole: saturate escape parameter in TTY_STATE_CSI
curses: don't initialize curses when qemu is daemonized
dtrace backend: add function to reserved words
pflash_cfi01: Fix warning caused by unreachable code
ioh3420: Remove unreachable code
lm4549: Fix buffer overflow
cadence_uart: Fix buffer overflow
qemu-sockets: Fix potential memory leak
qemu-ga: Remove unreachable code after g_error
target-i386: Allow tsc-frequency to be larger then 2.147G
Diffstat (limited to 'linux-user/syscall.c')
| -rw-r--r-- | linux-user/syscall.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 6257a04..471d060 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; } |