* [Qemu-devel] [PATCH] device-tree: fix memory leak
@ 2014-12-11 15:45 Sergey Fedorov
2014-12-15 15:17 ` Alexander Graf
0 siblings, 1 reply; 2+ messages in thread
From: Sergey Fedorov @ 2014-12-11 15:45 UTC (permalink / raw)
To: qemu-devel; +Cc: Sergey Fedorov, Peter Crosthwaite, Alexander Graf
Signed-off-by: Sergey Fedorov <serge.fdrv@gmail.com>
---
device_tree.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/device_tree.c b/device_tree.c
index df9eed9..4cb1cd5 100644
--- a/device_tree.c
+++ b/device_tree.c
@@ -324,6 +324,7 @@ int qemu_fdt_setprop_sized_cells_from_array(void *fdt,
uint64_t value;
int cellnum, vnum, ncells;
uint32_t hival;
+ int ret;
propcells = g_new0(uint32_t, numvalues * 2);
@@ -331,18 +332,23 @@ int qemu_fdt_setprop_sized_cells_from_array(void *fdt,
for (vnum = 0; vnum < numvalues; vnum++) {
ncells = values[vnum * 2];
if (ncells != 1 && ncells != 2) {
- return -1;
+ ret = -1;
+ goto out;
}
value = values[vnum * 2 + 1];
hival = cpu_to_be32(value >> 32);
if (ncells > 1) {
propcells[cellnum++] = hival;
} else if (hival != 0) {
- return -1;
+ ret = -1;
+ goto out;
}
propcells[cellnum++] = cpu_to_be32(value);
}
- return qemu_fdt_setprop(fdt, node_path, property, propcells,
- cellnum * sizeof(uint32_t));
+ ret = qemu_fdt_setprop(fdt, node_path, property, propcells,
+ cellnum * sizeof(uint32_t));
+out:
+ g_free(propcells);
+ return ret;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] device-tree: fix memory leak
2014-12-11 15:45 [Qemu-devel] [PATCH] device-tree: fix memory leak Sergey Fedorov
@ 2014-12-15 15:17 ` Alexander Graf
0 siblings, 0 replies; 2+ messages in thread
From: Alexander Graf @ 2014-12-15 15:17 UTC (permalink / raw)
To: Sergey Fedorov, qemu-devel; +Cc: Peter Crosthwaite
On 11.12.14 16:45, Sergey Fedorov wrote:
> Signed-off-by: Sergey Fedorov <serge.fdrv@gmail.com>
Thanks, applied to ppc-next.
Alex
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-12-15 15:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-11 15:45 [Qemu-devel] [PATCH] device-tree: fix memory leak Sergey Fedorov
2014-12-15 15:17 ` Alexander Graf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).