From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVeA0-0008V8-Hj for qemu-devel@nongnu.org; Thu, 13 Jul 2017 09:28:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dVe9x-0001Kr-0p for qemu-devel@nongnu.org; Thu, 13 Jul 2017 09:28:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60488) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dVe9w-0001K5-PK for qemu-devel@nongnu.org; Thu, 13 Jul 2017 09:28:00 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 51F88A78ED for ; Thu, 13 Jul 2017 13:27:58 +0000 (UTC) From: Markus Armbruster Date: Thu, 13 Jul 2017 15:27:50 +0200 Message-Id: <1499952476-3454-4-git-send-email-armbru@redhat.com> In-Reply-To: <1499952476-3454-1-git-send-email-armbru@redhat.com> References: <1499952476-3454-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL 3/9] websock: Don't try to set *errp directly List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , "Daniel P. Berrange" From: Eduardo Habkost Assigning directly to *errp is not valid, as errp may be NULL, &error_fatal, or &error_abort. Use error_propagate() instead. Cc: "Daniel P. Berrange" Signed-off-by: Eduardo Habkost Message-Id: <20170608133906.12737-4-ehabkost@redhat.com> Reviewed-by: Manos Pitsidianakis Reviewed-by: Eric Blake Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- io/channel-websock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/io/channel-websock.c b/io/channel-websock.c index 8fabade..5a3badb 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -856,7 +856,7 @@ static ssize_t qio_channel_websock_readv(QIOChannel *ioc, ssize_t ret; if (wioc->io_err) { - *errp = error_copy(wioc->io_err); + error_propagate(errp, error_copy(wioc->io_err)); return -1; } @@ -902,7 +902,7 @@ static ssize_t qio_channel_websock_writev(QIOChannel *ioc, ssize_t ret; if (wioc->io_err) { - *errp = error_copy(wioc->io_err); + error_propagate(errp, error_copy(wioc->io_err)); return -1; } -- 2.7.5