diff --git a/lib/SimpleSAML/MemcacheStore.php b/lib/SimpleSAML/MemcacheStore.php index b0b084ffc1381e42f6378712a834acdcff3f05ad..c5e5a1274cc38cc2e2889be1419ba3e09d602eb2 100644 --- a/lib/SimpleSAML/MemcacheStore.php +++ b/lib/SimpleSAML/MemcacheStore.php @@ -60,12 +60,12 @@ class SimpleSAML_MemcacheStore { assert(self::isValidID($id)); $serializedData = SimpleSAML_Memcache::get($id); - $data = unserialize($serializedData); - - if($data === NULL) { - return $NULL; + if($serializedData === NULL) { + return NULL; } + $data = unserialize($serializedData); + if(!($data instanceof self)) { SimpleSAML_Logger::warning('Retrieved key from memcache did not contain a MemcacheStore object.'); return NULL;