[glib-networking/enable-openssl-tests] fixup! Add back the handling of the syscall error



commit 1e0dc07c3a50be35d1aec0aad3bba9cca6980e93
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Fri May 24 09:49:38 2019 +0200

    fixup! Add back the handling of the syscall error

 tls/openssl/gtlsconnection-openssl.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/tls/openssl/gtlsconnection-openssl.c b/tls/openssl/gtlsconnection-openssl.c
index b595120..515f4fb 100644
--- a/tls/openssl/gtlsconnection-openssl.c
+++ b/tls/openssl/gtlsconnection-openssl.c
@@ -75,11 +75,14 @@ end_openssl_io (GTlsConnectionOpenssl  *openssl,
                 const char             *err_str)
 {
   GTlsConnectionBase *tls = G_TLS_CONNECTION_BASE (openssl);
+  GTlsConnectionOpensslPrivate *priv;
   int err_code, err, err_lib, reason;
   GError *my_error = NULL;
   GTlsConnectionBaseStatus status;
   SSL *ssl;
 
+  priv = g_tls_connection_openssl_get_instance_private (openssl);
+
   ssl = g_tls_connection_openssl_get_ssl (openssl);
 
   err_code = SSL_get_error (ssl, ret);
@@ -108,7 +111,7 @@ end_openssl_io (GTlsConnectionOpenssl  *openssl,
 
   /* This case is documented that it may happen and that is perfectly fine */
   if (err_code == SSL_ERROR_SYSCALL &&
-      ((shutting_down && !my_error) ||
+      ((priv->shutting_down && !my_error) ||
        g_error_matches (my_error, G_IO_ERROR, G_IO_ERROR_BROKEN_PIPE)))
     {
       g_clear_error (&my_error);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]