From 42d5fff9e302bb3e85f457bc5f41ece78ad9a722 Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Wed, 21 Oct 2015 11:29:06 +0200
Subject: [PATCH] Bugfix: if there's no session, getCookieSessionId() cannot
 return a session identifier, therefore there's no session we can return. This
 resolves #256.

---
 lib/SimpleSAML/Session.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/SimpleSAML/Session.php b/lib/SimpleSAML/Session.php
index 71326dd8d..a8ef4b26d 100644
--- a/lib/SimpleSAML/Session.php
+++ b/lib/SimpleSAML/Session.php
@@ -215,6 +215,9 @@ class SimpleSAML_Session
         if ($sessionId === null) {
             $checkToken = true;
             $sessionId = $sh->getCookieSessionId();
+            if ($sessionId === null) {
+                return null;
+            }
         } else {
             $checkToken = false;
         }
-- 
GitLab