From 31422cffcd55f662ad32a6f27c184b5f57e53d06 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Sun, 8 Mar 2020 21:54:22 -0700
Subject: [PATCH] deal with corrupted sessions in cookies, thanks Luca

---
 gluon/globals.py   | 9 ++++++---
 gluon/packages/dal | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gluon/globals.py b/gluon/globals.py
index 59a2f2d4..b98fe306 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -973,9 +973,12 @@ class Session(Storage):
                     if row:
                         # rows[0].update_record(locked=True)
                         # Unpickle the data
-                        session_data = pickle.loads(row['session_data'])
-                        self.update(session_data)
-                        response.session_new = False
+                        try:
+                            session_data = pickle.loads(row['session_data'])
+                            self.update(session_data)
+                            response.session_new = False
+                        except:
+                            record_id = None
                     else:
                         record_id = None
                 if record_id:
diff --git a/gluon/packages/dal b/gluon/packages/dal
index f74a107e..f9c870bb 160000
--- a/gluon/packages/dal
+++ b/gluon/packages/dal
@@ -1 +1 @@
-Subproject commit f74a107e00473b3d18ee407f83ab864753770d15
+Subproject commit f9c870bb3d009b0daad66f36933f07f1f582cf43