From e79ea67a9785a5da4d1889b6e2bb71d03e916add Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Thu, 8 Jun 2017 10:39:04 -0300 Subject: websock: Don't try to set *errp directly 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(-) (limited to 'io') diff --git a/io/channel-websock.c b/io/channel-websock.c index 8fabadea2f..5a3badbec2 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; } -- cgit v1.2.1