X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=saml%2Fsaml1%2Fprofile%2FAssertionValidator.cpp;fp=saml%2Fsaml1%2Fprofile%2FAssertionValidator.cpp;h=31014d41f38099bcde0e7cdb9ce15d3ab209b2bf;hp=69cdf25a7e2a22bb41a47edb5aa14e9d777ca4f2;hb=2f45703c670afd20e2d79e2dc51070856ae0eb65;hpb=d3e1e60e9a7c005e51b4cfe5f10c1c1ff5c35ee6

diff --git a/saml/saml1/profile/AssertionValidator.cpp b/saml/saml1/profile/AssertionValidator.cpp
index 69cdf25..31014d4 100644
--- 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)