diff mbox series

[2/4] error: Remove NULL checks on error_propagate() calls

Message ID 20180322161226.29796-3-lvivier@redhat.com
State New
Headers show
Series coccinelle: re-run scripts from scripts/coccinelle | expand

Commit Message

Laurent Vivier March 22, 2018, 4:12 p.m. UTC
Re-run Coccinelle patch
scripts/coccinelle/error_propagate_null.cocci

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
 io/channel-websock.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Eric Blake March 23, 2018, 8:50 p.m. UTC | #1
On 03/22/2018 11:12 AM, Laurent Vivier wrote:
> Re-run Coccinelle patch
> scripts/coccinelle/error_propagate_null.cocci
> 
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> ---
>   io/channel-websock.c | 4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
> 

Misses an offender in numa.c, why?

https://lists.gnu.org/archive/html/qemu-devel/2018-03/msg06382.html
Laurent Vivier March 26, 2018, 8:40 a.m. UTC | #2
On 23/03/2018 21:50, Eric Blake wrote:
> On 03/22/2018 11:12 AM, Laurent Vivier wrote:
>> Re-run Coccinelle patch
>> scripts/coccinelle/error_propagate_null.cocci
>>
>> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
>> ---
>>   io/channel-websock.c | 4 +---
>>   1 file changed, 1 insertion(+), 3 deletions(-)
>>
> 
> Misses an offender in numa.c, why?
> 
> https://lists.gnu.org/archive/html/qemu-devel/2018-03/msg06382.html
> 

No, error_report_err() doesn't check if  err is NULL, we must check
before calling it.

Thanks,
Laurent
diff mbox series

Patch

diff --git a/io/channel-websock.c b/io/channel-websock.c
index ec48a305f0..e6608b969d 100644
--- a/io/channel-websock.c
+++ b/io/channel-websock.c
@@ -586,9 +586,7 @@  static gboolean qio_channel_websock_handshake_io(QIOChannel *ioc,
         return TRUE;
     }
 
-    if (err) {
-        error_propagate(&wioc->io_err, err);
-    }
+    error_propagate(&wioc->io_err, err);
 
     trace_qio_channel_websock_handshake_reply(ioc);
     qio_channel_add_watch(