From bc78fd96d5be6e4e4f8d39d9add9c8d8d85bbe61 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Thu, 15 May 2008 14:09:57 +0000
Subject: [PATCH] MemcacheStore: Proper check for key-not-found.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@562 44740490-163a-0410-bde0-09ae8108e29a
---
 lib/SimpleSAML/MemcacheStore.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/SimpleSAML/MemcacheStore.php b/lib/SimpleSAML/MemcacheStore.php
index b0b084ffc..c5e5a1274 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;
-- 
GitLab