summaryrefslogtreecommitdiff
path: root/ui/spice-core.c
diff options
context:
space:
mode:
authorGonglei <arei.gonglei@huawei.com>2014-12-05 16:30:10 +0800
committerGerd Hoffmann <kraxel@redhat.com>2014-12-16 14:15:29 +0100
commita41642708a5d1cbe8ad966227bbee1ed5eb421ad (patch)
treee9a947c3f26b8e431735a5de3586b22dd8206ade /ui/spice-core.c
parente0883e2de0ef36f254acc274e80ddeac13a2a8f6 (diff)
downloadqemu-a41642708a5d1cbe8ad966227bbee1ed5eb421ad.tar.gz
spice: fix memory leak
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 <pbonzini@redhat.com> Signed-off-by: Gonglei <arei.gonglei@huawei.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'ui/spice-core.c')
-rw-r--r--ui/spice-core.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 497670c4d5..fe705c1ae2 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));