Fix for no conditions.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-opensaml2/trunk@354 fb386ef7-a10c-0410-8ebf-fd3f8e989ab0

diff --git a/saml/saml1/profile/AssertionValidator.cpp b/saml/saml1/profile/AssertionValidator.cpp
index 69cdf25..31014d4 100644 (file)
--- a/saml/saml1/profile/AssertionValidator.cpp
+++ b/saml/saml1/profile/AssertionValidator.cpp
@@ -47,8 +47,11 @@ void AssertionValidator::validateAssertion(const Assertion& assertion) const
 #endif
 
     const Conditions* conds = assertion.getConditions();
+    if (!conds)
+        return;
+    
     // First verify the time conditions, using the specified timestamp, if non-zero.
-    if (m_ts>0 && conds) {
+    if (m_ts>0) {
         unsigned int skew = XMLToolingConfig::getConfig().clock_skew_secs;
         time_t t=conds->getNotBeforeEpoch();
         if (m_ts+skew < t)

diff --git a/saml/saml2/profile/Assertion20Validator.cpp b/saml/saml2/profile/Assertion20Validator.cpp
index 373df27..faff298 100644 (file)
--- a/saml/saml2/profile/Assertion20Validator.cpp
+++ b/saml/saml2/profile/Assertion20Validator.cpp
@@ -47,8 +47,11 @@ void AssertionValidator::validateAssertion(const Assertion& assertion) const
 #endif
 
     const Conditions* conds = assertion.getConditions();
+    if (!conds)
+        return;
+    
     // First verify the time conditions, using the specified timestamp, if non-zero.
-    if (m_ts>0 && conds) {
+    if (m_ts>0) {
         unsigned int skew = XMLToolingConfig::getConfig().clock_skew_secs;
         time_t t=conds->getNotBeforeEpoch();
         if (m_ts+skew < t)
@@ -59,7 +62,6 @@ void AssertionValidator::validateAssertion(const Assertion& assertion) const
     }
 
     // Now we process conditions, starting with the known types and then extensions.
-
     const vector<AudienceRestriction*>& acvec = conds->getAudienceRestrictions();
     for (vector<AudienceRestriction*>::const_iterator ac = acvec.begin(); ac!=acvec.end(); ++ac)
         validateCondition(*ac);