[glib-networking/mcatanzaro/base-rebase] fixup! openssl: fix shutdown error

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 64622a97c114868807b4fe9c98f66f5459e8b351
Author: Ignacio Casal Quinteiro <qignacio amazon com>
Date:   Tue May 14 16:31:49 2019 +0200

    fixup! openssl: fix shutdown error

 tls/openssl/gtlsconnection-openssl.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/tls/openssl/gtlsconnection-openssl.c b/tls/openssl/gtlsconnection-openssl.c
index 9a5d777..5b7f979 100644
--- a/tls/openssl/gtlsconnection-openssl.c
+++ b/tls/openssl/gtlsconnection-openssl.c
@@ -105,9 +105,13 @@ end_openssl_io (GTlsConnectionOpenssl  *openssl,
     }
 
   /* This case is documented that it may happen and that is perfectly fine */
-  if (err_code == SSL_ERROR_SYSCALL && priv->shutting_down &&
-     (!my_error || g_error_matches(my_error, G_IO_ERROR, G_IO_ERROR_BROKEN_PIPE)))
-    return G_TLS_CONNECTION_BASE_OK;
+  if (err_code == SSL_ERROR_SYSCALL &&
+      ((priv->shutting_down && !my_error) ||
+       g_error_matches (my_error, G_IO_ERROR, G_IO_ERROR_BROKEN_PIPE)))
+    {
+      g_clear_error (&my_error);
+      return G_TLS_CONNECTION_BASE_OK;
+    }
 
   err = ERR_get_error ();
   err_lib = ERR_GET_LIB (err);