From a91cada4fb652b58d162f69c087a6e1d62619ecc Mon Sep 17 00:00:00 2001 From: fiaxh Date: Wed, 7 Apr 2021 23:39:02 +0200 Subject: Fix segfault on bad certificate with multiple xmpp records Co-authored-by: Marvin W --- xmpp-vala/src/core/starttls_xmpp_stream.vala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xmpp-vala/src/core/starttls_xmpp_stream.vala') diff --git a/xmpp-vala/src/core/starttls_xmpp_stream.vala b/xmpp-vala/src/core/starttls_xmpp_stream.vala index 1e4f7954..ed5fbdda 100644 --- a/xmpp-vala/src/core/starttls_xmpp_stream.vala +++ b/xmpp-vala/src/core/starttls_xmpp_stream.vala @@ -4,13 +4,13 @@ public class Xmpp.StartTlsXmppStream : TlsXmppStream { string host; uint16 port; - TlsXmppStream.OnInvalidCert on_invalid_cert_outer; + TlsXmppStream.OnInvalidCertWrapper on_invalid_cert; - public StartTlsXmppStream(Jid remote, string host, uint16 port, owned TlsXmppStream.OnInvalidCert on_invalid_cert) { + public StartTlsXmppStream(Jid remote, string host, uint16 port, TlsXmppStream.OnInvalidCertWrapper on_invalid_cert) { base(remote); this.host = host; this.port = port; - this.on_invalid_cert_outer = (owned)on_invalid_cert; + this.on_invalid_cert = on_invalid_cert; } public override async void connect() throws IOStreamError { @@ -42,7 +42,7 @@ public class Xmpp.StartTlsXmppStream : TlsXmppStream { reset_stream(conn); conn.accept_certificate.connect(on_invalid_certificate); - conn.accept_certificate.connect((cert, flags) => on_invalid_cert_outer(cert, flags)); + conn.accept_certificate.connect((cert, flags) => on_invalid_cert.func(cert, flags)); } catch (Error e) { stderr.printf("Failed to start TLS: %s\n", e.message); } -- cgit v1.2.3-54-g00ecf