From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50465) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UDCFv-0007IL-Lz for qemu-devel@nongnu.org; Wed, 06 Mar 2013 06:11:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UDCFt-0007oC-58 for qemu-devel@nongnu.org; Wed, 06 Mar 2013 06:11:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:63415) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UDCFs-0007o5-TT for qemu-devel@nongnu.org; Wed, 06 Mar 2013 06:11:29 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r26BBSef007617 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 6 Mar 2013 06:11:28 -0500 Date: Wed, 6 Mar 2013 12:11:26 +0100 From: Kevin Wolf Message-ID: <20130306111126.GA2285@dhcp-200-207.str.redhat.com> References: <1362566886-14073-1-git-send-email-kwolf@redhat.com> <513722BD.6010503@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <513722BD.6010503@redhat.com> Subject: Re: [Qemu-devel] [PATCH] qemu-sockets: Fix assertion failure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org Am 06.03.2013 um 12:04 hat Paolo Bonzini geschrieben: > Il 06/03/2013 11:48, Kevin Wolf ha scritto: > > inet_connect_opts() tries all possible addrinfos returned by > > getaddrinfo(). If one fails with an error, the next one is tried. In > > this case, the Error should be discarded because the whole operation is > > successful if another addrinfo from the list succeeds; and if it > > doesn't, setting an already set Error will trigger an assertion failure. > > > > Signed-off-by: Kevin Wolf > > --- > > util/qemu-sockets.c | 8 ++++++++ > > 1 file changed, 8 insertions(+) > > > > diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c > > index 1350ccc..32e609a 100644 > > --- a/util/qemu-sockets.c > > +++ b/util/qemu-sockets.c > > @@ -373,6 +373,14 @@ int inet_connect_opts(QemuOpts *opts, Error **errp, > > } > > > > for (e = res; e != NULL; e = e->ai_next) { > > + > > + /* Overwriting errors isn't allowed, so clear any error that may have > > + * occured in the previous iteration */ > > + if (error_is_set(errp)) { > > + error_free(*errp); > > + *errp = NULL; > > + } > > + > > if (connect_state != NULL) { > > connect_state->current_addr = e; > > } > > > > Should we also do nothing if errp is not NULL on entry? We could assert(!error_is_set(errp)) if we wanted. As soon as you've got an Error, you must return instead of calling more functions with the same error pointer. Kevin