[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 16/26] hw/xen: Use g_free instead of free and fix p
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 16/26] hw/xen: Use g_free instead of free and fix potential memory leaks |
Date: |
Fri, 14 Jun 2013 14:50:32 +0400 |
From: Stefan Weil <address@hidden>
The wrong functions and the missing calls of g_free were reported
by cppcheck.
Signed-off-by: Stefan Weil <address@hidden>
Acked-by: Stefano Stabellini <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/xen/xen_pt_config_init.c | 4 ++--
xen-all.c | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c
index 01872db..8ccc2e4 100644
--- a/hw/xen/xen_pt_config_init.c
+++ b/hw/xen/xen_pt_config_init.c
@@ -1777,12 +1777,12 @@ static int
xen_pt_config_reg_init(XenPCIPassthroughState *s,
rc = reg->init(s, reg_entry->reg,
reg_grp->base_offset + reg->offset, &data);
if (rc < 0) {
- free(reg_entry);
+ g_free(reg_entry);
return rc;
}
if (data == XEN_PT_INVALID_REG) {
/* free unused BAR register entry */
- free(reg_entry);
+ g_free(reg_entry);
return 0;
}
/* set register value */
diff --git a/xen-all.c b/xen-all.c
index bc105f1..1a1d7bb 100644
--- a/xen-all.c
+++ b/xen-all.c
@@ -389,7 +389,7 @@ static int xen_remove_from_physmap(XenIOState *state,
if (state->log_for_dirtybit == physmap) {
state->log_for_dirtybit = NULL;
}
- free(physmap);
+ g_free(physmap);
return 0;
}
@@ -1030,7 +1030,7 @@ static void xen_read_physmap(XenIOState *state)
xen_domid, entries[i]);
value = xs_read(state->xenstore, 0, path, &len);
if (value == NULL) {
- free(physmap);
+ g_free(physmap);
continue;
}
physmap->start_addr = strtoull(value, NULL, 16);
@@ -1041,7 +1041,7 @@ static void xen_read_physmap(XenIOState *state)
xen_domid, entries[i]);
value = xs_read(state->xenstore, 0, path, &len);
if (value == NULL) {
- free(physmap);
+ g_free(physmap);
continue;
}
physmap->size = strtoull(value, NULL, 16);
@@ -1069,12 +1069,14 @@ int xen_hvm_init(void)
state->xce_handle = xen_xc_evtchn_open(NULL, 0);
if (state->xce_handle == XC_HANDLER_INITIAL_VALUE) {
perror("xen: event channel open");
+ g_free(state);
return -errno;
}
state->xenstore = xs_daemon_open();
if (state->xenstore == NULL) {
perror("xen: xenstore open");
+ g_free(state);
return -errno;
}
--
1.7.10.4
- Re: [Qemu-trivial] [PULL 00/26] Trivial-patches pull request for 2013-06-14, (continued)
- Re: [Qemu-trivial] [PULL 00/26] Trivial-patches pull request for 2013-06-14, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 19/26] KVM: S390: Add dummy kvm_arch_init_irq_routing(), Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 11/26] Unbreak -no-quit for GTK, validate SDL options, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 25/26] cputlb: fix debug logs, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 12/26] Makefile: Install qemu-img and qemu-nbd man pages only if built, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 06/26] curl: Whitespace only changes., Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 13/26] device tree: Fix cppcheck warning, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 15/26] target-sparc: Replace free by g_free, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 23/26] main-loop: do not include slirp/slirp.h, use libslirp.h instead, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 10/26] gtk: implement -full-screen, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 16/26] hw/xen: Use g_free instead of free and fix potential memory leaks,
Michael Tokarev <=
- [Qemu-trivial] [PULL 24/26] create qemu_openpty_raw() helper function and move it to a separate file, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 14/26] hw/scsi: Don't increment a boolean value, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 26/26] piix: fix some printf errors when debug is enabled, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 09/26] char/serial: serial_ioport_write: Factor out common code, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 20/26] KVM: PPC: Add dummy kvm_arch_init_irq_routing(), Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 07/26] char/serial: cosmetic fixes., Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 17/26] ivshmem: add missing error exit(2), Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 08/26] char/serial: Use generic Fifo8, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 22/26] libcacard/vscclient: fix leakage of socket on error paths, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 18/26] KVM: ARM: Add dummy kvm_arch_init_irq_routing(), Michael Tokarev, 2013/06/14