[opensaml2] 28/38: SSPCPP-684 Fix hideous bracket bug in 45eeb69937

Ferenc Wágner wferi at moszumanska.debian.org
Tue Aug 30 20:53:57 UTC 2016


This is an automated email from the git hooks/post-receive script.

wferi pushed a commit to branch master
in repository opensaml2.

commit f496d1ac3e06d49d68f1488c217fc20a1863cebc
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date:   Wed Jun 15 15:00:42 2016 +0100

    SSPCPP-684 Fix hideous bracket bug in 45eeb69937
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-684
---
 saml/saml2/metadata/impl/XMLMetadataProvider.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/saml/saml2/metadata/impl/XMLMetadataProvider.cpp b/saml/saml2/metadata/impl/XMLMetadataProvider.cpp
index 3e4d508..65da041 100644
--- a/saml/saml2/metadata/impl/XMLMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/XMLMetadataProvider.cpp
@@ -213,13 +213,13 @@ pair<bool,DOMElement*> XMLMetadataProvider::load(bool backup)
     scoped_ptr<XMLObject> xmlObject(XMLObjectBuilder::buildOneFromElement(raw.second, true));
     docjanitor.release();
 
-    if (!dynamic_cast<const EntitiesDescriptor*>(xmlObject.get()) && !dynamic_cast<const EntityDescriptor*>(xmlObject.get()))
+    if (!dynamic_cast<const EntitiesDescriptor*>(xmlObject.get()) && !dynamic_cast<const EntityDescriptor*>(xmlObject.get())) {
         if (!backupKey.empty())
             remove(backupKey.c_str());
         throw MetadataException(
             "Root of metadata instance not recognized: $1", params(1,xmlObject->getElementQName().toString().c_str())
             );
-
+    }
     // Preprocess the metadata (even if we schema-validated).
     try {
         SchemaValidators.validate(xmlObject.get());

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/opensaml2.git



More information about the Pkg-shibboleth-devel mailing list