xmlsecurity/source/dialogs/certificateviewer.cxx | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit d746a99558a3f9c8625988ed87264ff12b355859
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Jul 4 15:19:35 2016 +0200
Certificate viewer dialog can have various kinds of parents
...like the "Security Warning: Domain Name Mismatch" WarnDialog (cf.
TITLE_UUI_SSLWARN_DOMAINMISMATCH in uui), not only a CertificateChooser.
Regression introduced with c42be58e4c006ab3e1f262b644789cba8659d0ab "Show
the
certificate use also in the View Certificate dialog", for which this fix is
hopefully fine.
Change-Id: I6efced1ebaad07c314fe7a5dd1cdc8e91d34555e
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx
b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 3749160..a256d3d 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -280,9 +280,11 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP(
vcl::Window* _pParent, C
InsertElement( XMLSEC_RES( STR_SIGNATURE_ALGO ), aLBEntry, aDetails );
CertificateChooser* pChooser =
dynamic_cast<CertificateChooser*>(mpDlg->GetParent());
- assert(pChooser);
- aLBEntry = pChooser->UsageInClearText(
mpDlg->mxCert->getCertificateUsage() );
- InsertElement( XMLSEC_RES( STR_USE ), aLBEntry, aLBEntry );
+ if (pChooser)
+ {
+ aLBEntry = pChooser->UsageInClearText(
mpDlg->mxCert->getCertificateUsage() );
+ InsertElement( XMLSEC_RES( STR_USE ), aLBEntry, aLBEntry );
+ }
aSeq = xCert->getSHA1Thumbprint();
aLBEntry = XmlSec::GetHexString( aSeq, pHexSep );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
