[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/6] spice: fix memory leak
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 6/6] spice: fix memory leak |
Date: |
Tue, 16 Dec 2014 15:13:37 +0100 |
From: Gonglei <address@hidden>
If errors happen for middle items of channel_list,
qmp_query_spice_channels() returns NULL, and the variable
cur_item going out of scope leaks the storage it points to.
The flag is a compatibility thing for older spice-server
versions. Meanwhile our minimum spice version requirement is
new enough that we should never ever see this error, and if we
do something went very seriously wrong. Let's using assert()
instead of returning NULL to avoid a memory leak.
Suggested-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/spice-core.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 497670c..fe705c1 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -385,10 +385,7 @@ static SpiceChannelList *qmp_query_spice_channels(void)
struct sockaddr *paddr;
socklen_t plen;
- if (!(item->info->flags & SPICE_CHANNEL_EVENT_FLAG_ADDR_EXT)) {
- error_report("invalid channel event");
- return NULL;
- }
+ assert(item->info->flags & SPICE_CHANNEL_EVENT_FLAG_ADDR_EXT);
chan = g_malloc0(sizeof(*chan));
chan->value = g_malloc0(sizeof(*chan->value));
--
1.8.3.1
- [Qemu-devel] [PULL 0/6] spice patch queue, Gerd Hoffmann, 2014/12/16
- [Qemu-devel] [PULL 3/6] spice: rework mirror allocation, add no-resize fast path, Gerd Hoffmann, 2014/12/16
- [Qemu-devel] [PULL 2/6] spice: reduce refresh rate in native mode, Gerd Hoffmann, 2014/12/16
- [Qemu-devel] [PULL 1/6] spice: use bottom half instead of refresh timer for cursor updates, Gerd Hoffmann, 2014/12/16
- [Qemu-devel] [PULL 4/6] spice: do not require TCP ports, Gerd Hoffmann, 2014/12/16
- [Qemu-devel] [PULL 6/6] spice: fix memory leak,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 5/6] spice: remove spice-experimental.h include, Gerd Hoffmann, 2014/12/16
- Re: [Qemu-devel] [PULL 0/6] spice patch queue, Peter Maydell, 2014/12/17