From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48584) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UDC9C-0004n8-PL for qemu-devel@nongnu.org; Wed, 06 Mar 2013 06:04:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UDC9B-0004zU-EG for qemu-devel@nongnu.org; Wed, 06 Mar 2013 06:04:34 -0500 Received: from mail-wg0-f46.google.com ([74.125.82.46]:56544) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UDC9B-0004zK-82 for qemu-devel@nongnu.org; Wed, 06 Mar 2013 06:04:33 -0500 Received: by mail-wg0-f46.google.com with SMTP id fg15so7135120wgb.13 for ; Wed, 06 Mar 2013 03:04:32 -0800 (PST) Sender: Paolo Bonzini Message-ID: <513722BD.6010503@redhat.com> Date: Wed, 06 Mar 2013 12:04:29 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1362566886-14073-1-git-send-email-kwolf@redhat.com> In-Reply-To: <1362566886-14073-1-git-send-email-kwolf@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] qemu-sockets: Fix assertion failure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: qemu-devel@nongnu.org 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? Paolo