From a41642708a5d1cbe8ad966227bbee1ed5eb421ad Mon Sep 17 00:00:00 2001 From: Gonglei Date: Fri, 5 Dec 2014 16:30:10 +0800 Subject: 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 Signed-off-by: Gonglei Reviewed-by: Eric Blake Signed-off-by: Gerd Hoffmann --- ui/spice-core.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'ui/spice-core.c') 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)); -- cgit v1.1