summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-03-11 20:23:31 +0000
committerMichael Stahl <michael.stahl@allotropia.de>2021-03-25 10:25:09 +0100
commite6bb72dd4c6a9f9743f3585e22576f589e5e74ba (patch)
tree2416b34567c85ef6b5afa763dbba5bbe6e5fe865
parente3d8bf61586786dcbf5ddb985367483971a0cc4b (diff)
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@allotropia.de> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112412 (cherry picked from commit 52a23d595b820cab27d76d0e7c129f2757c762d6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113050 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
-rw-r--r--xmlsecurity/source/helper/xmlsignaturehelper.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index 6ec834053a17..22c056e70da1 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -402,6 +402,7 @@ bool XMLSignatureHelper::ReadAndVerifySignatureStorageStream(const css::uno::Ref
catch(const uno::Exception&)
{
DBG_UNHANDLED_EXCEPTION("xmlsecurity.helper");
+ mbError = true;
}
mpXSecController->releaseSignatureReader();