1 files changed, 6 insertions, 0 deletions
diff --git a/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp b/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp
index ac36f4f..76b8bb9 100644
--- a/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp
+++ b/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp
@@ -30,25 +30,31 @@ OpenSSLCertificate::OpenSSLCertificate(const ByteArray& der) {
 	cert = boost::shared_ptr<X509>(d2i_X509(NULL, &p, der.size()), X509_free);
 	if (!cert) {
 		SWIFT_LOG(warning) << "Error creating certificate from DER data" << std::endl;
 	}
 	parse();
 }
 
 ByteArray OpenSSLCertificate::toDER() const {
 	ByteArray result;
+	if (!cert) {
+		return result;
+	}
 	result.resize(i2d_X509(cert.get(), NULL));
 	unsigned char* p = vecptr(result);
 	i2d_X509(cert.get(), &p);
 	return result;
 }
 
 void OpenSSLCertificate::parse() {
+	if (!cert) {
+		return;
+	}
 	// Subject name
 	X509_NAME* subjectName = X509_get_subject_name(cert.get());
 	if (subjectName) {
 		// Subject name
 		ByteArray subjectNameData;
 		subjectNameData.resize(256);
 		X509_NAME_oneline(X509_get_subject_name(cert.get()), reinterpret_cast<char*>(vecptr(subjectNameData)), subjectNameData.size());
 		this->subjectName = byteArrayToString(subjectNameData);