[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - xmlsecurity/source

[Caolán McNamara (via logerrit)]

 xmlsecurity/source/helper/xmlsignaturehelper.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6949361dd44d196f0ca74d4d3e71387d1f6cb775
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Mar 11 20:23:31 2021 +0000
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Fri Mar 26 18:36:54 2021 +0100

    do same set error state as ReadAndVerifySignature does
    
    this function is nearly exactly the same as ReadAndVerifySignature
    except it doesn't set error-state on exception during parse
    
    Change-Id: Ife881f639a11d3185920ca62cc2cd22812fae36d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112366
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112412
    (cherry picked from commit 52a23d595b820cab27d76d0e7c129f2757c762d6)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113089
    Tested-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index a3bb382a8ea4..09487ac673e9 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -420,6 +420,7 @@ bool XMLSignatureHelper::ReadAndVerifySignatureStorageStream(const css::uno::Ref
     catch(const uno::Exception&)
     {
         DBG_UNHANDLED_EXCEPTION("xmlsecurity.helper");
+        mbError = true;
     }
 
     mpXSecController->releaseSignatureReader();