From 1c4aeec310b22e7f93d4386da1582f79181e57cd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Olivier=20Cr=C3=AAte?= Date: Wed, 2 Apr 2014 11:25:27 -0400 Subject: [PATCH] tcp-bsd: Don't clear error that hasn't been set --- socket/tcp-bsd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/socket/tcp-bsd.c b/socket/tcp-bsd.c index c6f50a0..79a0918 100644 --- a/socket/tcp-bsd.c +++ b/socket/tcp-bsd.c @@ -393,8 +393,7 @@ socket_send_more ( } if (ret < 0) { - if (gerr != NULL && - g_error_matches (gerr, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) { + if (g_error_matches (gerr, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) { GOutputVector local_buf = { tbs->buf, tbs->length }; NiceOutputMessage local_message = {&local_buf, 1}; @@ -403,7 +402,7 @@ socket_send_more ( g_error_free (gerr); break; } - g_error_free (gerr); + g_clear_error (&gerr); } else if (ret < (int) tbs->length) { GOutputVector local_buf = { tbs->buf + ret, tbs->length - ret }; NiceOutputMessage local_message = {&local_buf, 1}; -- 2.7.4