From a04f73ee8051b68f5b95d6f71d3b637a8c9a8c92 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 27 Mar 2014 12:34:01 +0100
Subject: [PATCH] [IMP] cookies: when retrieving session cookie, catch eventual
 errors and remove malformed cookie

bzr revid: mat@openerp.com-20140327113401-s3ee7fnexhre9mwb
---
 addons/web/static/src/js/coresetup.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 7d37dc2261d..85c3284cb8f 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -125,7 +125,12 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
         for(var i=0; i<cookies.length; ++i) {
             var cookie = cookies[i].replace(/^\s*/, '');
             if(cookie.indexOf(nameEQ) === 0) {
-                return JSON.parse(decodeURIComponent(cookie.substring(nameEQ.length)));
+                try {
+                    return JSON.parse(decodeURIComponent(cookie.substring(nameEQ.length)));
+                } catch (err) {
+                    // delete malformed cookie
+                    this.set_cookie(name, '', -1);
+                }
             }
         }
         return null;