[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - cui/source

[Tor Lillqvist]

 cui/source/options/optgenrl.cxx |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 29840645e2cb8231040bcbac1b1fe98f494c92c9
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Dec 22 15:23:43 2017 +0200

    Avoid crash without GPG
    
    Change-Id: I5489012544fdf736784608b274359ea99f9ffe45
    (cherry picked from commit 1b73ed91e1cce20b3b552a36d449fb96cc57bf4f)
    Reviewed-on: https://gerrit.libreoffice.org/46977
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index c25144f04266..0816a8c49821 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -308,15 +308,18 @@ void SvxGeneralTabPage::InitCryptography()
     {
         xSEInitializer = xml::crypto::GPGSEInitializer::create( comphelper::getProcessComponentContext() );
         uno::Reference<xml::crypto::XXMLSecurityContext> xSC = xSEInitializer->createSecurityContext( OUString() );
-        uno::Reference<xml::crypto::XSecurityEnvironment> xSE = xSC->getSecurityEnvironment();
-        uno::Sequence<uno::Reference<security::XCertificate>> xCertificates = xSE->getPersonalCertificates();
-
-        if (xCertificates.hasElements())
+        if (xSC.is())
         {
-            for (auto& xCert : xCertificates)
+            uno::Reference<xml::crypto::XSecurityEnvironment> xSE = xSC->getSecurityEnvironment();
+            uno::Sequence<uno::Reference<security::XCertificate>> xCertificates = xSE->getPersonalCertificates();
+
+            if (xCertificates.hasElements())
             {
-                m_pSigningKeyLB->InsertEntry( xCert->getIssuerName());
-                m_pEncryptionKeyLB->InsertEntry( xCert->getIssuerName());
+                for (auto& xCert : xCertificates)
+                {
+                    m_pSigningKeyLB->InsertEntry( xCert->getIssuerName());
+                    m_pEncryptionKeyLB->InsertEntry( xCert->getIssuerName());
+                }
             }
         }
     }