[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - xmlsecurity/source

[Thorsten Behrens]

 xmlsecurity/source/dialogs/certificatechooser.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e351432c782a93fef0dcdb17135b6da735bd4194
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date:   Sat Jul 1 10:22:06 2017 +0200

    xmlsecurity: avoid crash on empty security context
    
    This should prevent 8cf224c2-f9b9-44e1-9cb0-fc452e570886
    
    Change-Id: I1ad4d8437923eb677d574c2c469cc62378c9c7a6
    Reviewed-on: https://gerrit.libreoffice.org/39430
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
    (cherry picked from commit 01985fd8fccf46749b74ee733391ce8b6ec1f1f8)
    Reviewed-on: https://gerrit.libreoffice.org/39444

diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx 
b/xmlsecurity/source/dialogs/certificatechooser.cxx
index cb9d2db4d4e5..828823974182 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -153,6 +153,8 @@ void CertificateChooser::ImplInitialize()
 
     for (auto &secContext : mxSecurityContexts)
     {
+        if (!secContext.is())
+            continue;
         auto secEnvironment = secContext->getSecurityEnvironment();
         if (!secEnvironment.is())
             continue;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits