Fix double free bug in policy, add support for assertions in message rules.

[shibboleth/cpp-opensaml.git] / saml / binding / impl / SecurityPolicy.cpp

diff --git a/saml/binding/impl/SecurityPolicy.cpp b/saml/binding/impl/SecurityPolicy.cpp
index 83e7f68..ef98f7b 100644 (file)
--- a/saml/binding/impl/SecurityPolicy.cpp
+++ b/saml/binding/impl/SecurityPolicy.cpp
@@ -79,10 +79,8 @@ void SecurityPolicy::evaluate(const XMLObject& message, const GenericRequest* re
 
 void SecurityPolicy::setIssuer(saml2::Issuer* issuer)
 {
-    if (!getIssuerMatchingPolicy().issuerMatches(issuer, m_issuer)) {
-        delete issuer;
-        throw BindingException("A rule supplied an Issuer that conflicts with previous results.");
-    }
+    if (!getIssuerMatchingPolicy().issuerMatches(issuer, m_issuer))
+        throw SecurityPolicyException("A rule supplied an Issuer that conflicts with previous results.");
     
     delete m_issuer;
     m_issuer=issuer;
@@ -91,7 +89,7 @@ void SecurityPolicy::setIssuer(saml2::Issuer* issuer)
 void SecurityPolicy::setIssuerMetadata(const RoleDescriptor* issuerRole)
 {
     if (issuerRole && m_issuerRole && issuerRole!=m_issuerRole)
-        throw BindingException("A rule supplied a RoleDescriptor that conflicts with previous results.");
+        throw SecurityPolicyException("A rule supplied a RoleDescriptor that conflicts with previous results.");
     m_issuerRole=issuerRole;
 }