summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-03-11 20:23:31 +0000
committerAndras Timar <andras.timar@collabora.com>2021-10-27 21:01:49 +0200
commitff80b0f3126506b4baac67ce67e224a7c3a68c8d (patch)
tree952eb3b622c8197155ea503e061036a7d75be211
parentInstall UCRT from MSUs, not using nested VC Redist install (diff)
downloadcore-ff80b0f3126506b4baac67ce67e224a7c3a68c8d.tar.gz
core-ff80b0f3126506b4baac67ce67e224a7c3a68c8d.zip
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 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) Change-Id: Ife881f639a11d3185920ca62cc2cd22812fae36d
-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 28020545d74d..7d9d051383e1 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -403,6 +403,7 @@ bool XMLSignatureHelper::ReadAndVerifySignatureStorageStream(const css::uno::Ref
catch(const uno::Exception& rException)
{
SAL_WARN("xmlsecurity.helper", "XMLSignatureHelper::ReadAndVerifySignatureStorageStream: " << rException);
+ mbError = true;
}
mpXSecController->releaseSignatureReader();