diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-02-06 12:57:54 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-02-06 12:57:54 +0000 |
| commit | 2021b7c9716cd579e20b4993ed75842f4e0deb34 (patch) | |
| tree | 11474943c7e154794cd207afbb08bf5046f173ea /monitor/misc.c | |
| parent | 418fa86dd465b4fd8394373cf83db8fa65d7611c (diff) | |
| parent | 8ef350b32fe08d254f92a3a7efe89809397fff77 (diff) | |
| download | focaccia-qemu-2021b7c9716cd579e20b4993ed75842f4e0deb34.tar.gz focaccia-qemu-2021b7c9716cd579e20b4993ed75842f4e0deb34.zip | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging
trivial patches 20200206 # gpg: Signature made Thu 06 Feb 2020 12:49:19 GMT # gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C # gpg: issuer "laurent@vivier.eu" # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full] # gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full] # gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full] # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * remotes/vivier2/tags/trivial-branch-pull-request: MAINTAINERS: Cc the qemu-arm@nongnu.org for the ARM machines aspeed/i2c: Prevent uninitialized warning hw/pci/pci_bridge: Fix typo in comment qemu-img: Place the '-i aio' option in alphabetical order qemu-options: replace constant 1 with HAS_ARG MAINTAINERS: Cover hppa-softmmu.mak in the HP-PARISC Machines section hw/i386/vmmouse: Fix crash when using the vmmouse on a machine without vmport hw/bt: Remove empty Kconfig file hw/timer/m48t59: Convert debug printf()s to trace events MAINTAINERS: update Leif Lindholm's address monitor: fix memory leak in monitor_fdset_dup_fd_find_remove hw/smbios/smbios: Remove unused include Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'monitor/misc.c')
| -rw-r--r-- | monitor/misc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/monitor/misc.c b/monitor/misc.c index 4752150a67..9c3484d0a7 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -1749,6 +1749,7 @@ static int64_t monitor_fdset_dup_fd_find_remove(int dup_fd, bool remove) if (mon_fdset_fd_dup->fd == dup_fd) { if (remove) { QLIST_REMOVE(mon_fdset_fd_dup, next); + g_free(mon_fdset_fd_dup); if (QLIST_EMPTY(&mon_fdset->dup_fds)) { monitor_fdset_cleanup(mon_fdset); } |