X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcarddav%2Fcarddav.cpp;h=52ae03aa49eea14e7794553691f726e36290de01;hb=274f4cd4b1b656e0ad4119e3969c9ccf59a2f209;hp=7e73c5f59546d0a12a7764f722de7a01dc4cbb94;hpb=33d42b86e8f3b66c7af4f8bfceeee4d4987a59c5;p=xestiaab%2F.git

diff --git a/source/carddav/carddav.cpp b/source/carddav/carddav.cpp
index 7e73c5f..52ae03a 100644
--- a/source/carddav/carddav.cpp
+++ b/source/carddav/carddav.cpp
@@ -529,6 +529,14 @@ void CardDAV::SetConnectionObject(CURL *ConnectionObjectIn){
 
 PCCERT_CONTEXT CardDAV::GetCertificateContextPointer(){
 
+	// Check that the PCCERT_CONTEXT has an address
+	// other than NULL. Return nullptr if this is the
+	// case.
+
+	if (CertificateData == NULL){
+		return NULL;
+	}
+
 	// Get the certificate data.
 
 	return CertificateData;
@@ -537,6 +545,15 @@ PCCERT_CONTEXT CardDAV::GetCertificateContextPointer(){
 
 CERT_CONTEXT CardDAV::GetCertificateContext(){
 
+	// Check that the PCCERT_CONTEXT has an address
+	// other than NULL. Return nullptr if this is the
+	// case.
+
+	if (CertificateData == NULL){
+		CERT_CONTEXT EmptyCertificateData = { 0 };
+		return EmptyCertificateData;
+	}
+
 	// Get the certificate data.
 
 	return *CertificateData;