[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/9] websock: Don't try to set *errp directly
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 3/9] websock: Don't try to set *errp directly |
Date: |
Thu, 13 Jul 2017 15:27:50 +0200 |
From: Eduardo Habkost <address@hidden>
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" <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Manos Pitsidianakis <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
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
- [Qemu-devel] [PULL 0/9] Error reporting patches for 2017-07-13, Markus Armbruster, 2017/07/13
- [Qemu-devel] [PULL 4/9] util/qemu-error: Rename error_print_loc() to be more generic, Markus Armbruster, 2017/07/13
- [Qemu-devel] [PULL 7/9] char-socket: Report TCP socket waiting as information, Markus Armbruster, 2017/07/13
- [Qemu-devel] [PULL 8/9] error: Implement the warn and free Error functions, Markus Armbruster, 2017/07/13
- [Qemu-devel] [PULL 3/9] websock: Don't try to set *errp directly,
Markus Armbruster <=
- [Qemu-devel] [PULL 5/9] error: Functions to report warnings and informational messages, Markus Armbruster, 2017/07/13
- [Qemu-devel] [PULL 2/9] block: Don't try to set *errp directly, Markus Armbruster, 2017/07/13
- [Qemu-devel] [PULL 9/9] Convert error_report*_err() to warn_report*_err(), Markus Armbruster, 2017/07/13
- [Qemu-devel] [PULL 1/9] xilinx: Fix latent error handling bug, Markus Armbruster, 2017/07/13
- [Qemu-devel] [PULL 6/9] Convert error_report() to warn_report(), Markus Armbruster, 2017/07/13