summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgnacio Casal Quinteiro <icq@gnome.org>2019-05-23 10:40:19 +0200
committerIgnacio Casal Quinteiro <icq@gnome.org>2019-05-24 12:04:12 +0200
commitc4d78d40db43f5e066b5cabcfd009d1449c73010 (patch)
treecbad3f9507e3a4a0340762752d95a3570c58971f
parent21119be720badcde63dd650fa1ebb77f829c76ee (diff)
downloadglib-networking-c4d78d40db43f5e066b5cabcfd009d1449c73010.tar.gz
openssl: popping happens in a loop so the push should also happen there
-rw-r--r--tls/openssl/gtlsconnection-openssl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tls/openssl/gtlsconnection-openssl.c b/tls/openssl/gtlsconnection-openssl.c
index 04f6505..6eb803b 100644
--- a/tls/openssl/gtlsconnection-openssl.c
+++ b/tls/openssl/gtlsconnection-openssl.c
@@ -194,11 +194,11 @@ end_openssl_io (GTlsConnectionOpenssl *openssl,
return G_TLS_CONNECTION_BASE_ERROR;
}
-#define BEGIN_OPENSSL_IO(openssl, direction, timeout, cancellable) \
- g_tls_connection_base_push_io (G_TLS_CONNECTION_BASE (openssl), \
- direction, timeout, cancellable); \
+#define BEGIN_OPENSSL_IO(openssl, direction, timeout, cancellable) \
do { \
- char error_str[256];
+ char error_str[256]; \
+ g_tls_connection_base_push_io (G_TLS_CONNECTION_BASE (openssl), \
+ direction, timeout, cancellable);
#define END_OPENSSL_IO(openssl, direction, ret, status, errmsg, err) \
ERR_error_string_n (SSL_get_error (ssl, ret), error_str, sizeof(error_str)); \