From 2b48ddd3c95d94f91f7452f9e809b4dc95ac2056 Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Sat, 6 Apr 2019 23:20:44 +0300
Subject: [PATCH] Move NULL check for cert above pubkey

This patch was originally proposed by Chi Li.

Fixes #944
---
 src/core/network-openssl.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 95697135..265d3574 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -854,14 +854,13 @@ int irssi_ssl_handshake(GIOChannel *handle)
 	}
 
 	cert = SSL_get_peer_certificate(chan->ssl);
-	pubkey = X509_get_X509_PUBKEY(cert);
-
 	if (cert == NULL) {
 		g_warning("TLS server supplied no certificate");
 		ret = 0;
 		goto done;
 	}
 
+	pubkey = X509_get_X509_PUBKEY(cert);
 	if (pubkey == NULL) {
 		g_warning("TLS server supplied no certificate public key");
 		ret = 0;