From: Martin Trigaux <mat@openerp.com>
Date: Thu, 27 Mar 2014 12:08:26 +0000 (+0100)
Subject: [IMP] cookies: when retrieving session cookie, catch eventual parsing errors and... 
X-Git-Tag: InsPy_master01~210^2^2~53
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=64ecfa40ec898bbfc5f4faa22eee4b98b024e524;p=odoo%2Fodoo.git

[IMP] cookies: when retrieving session cookie, catch eventual parsing errors and remove cookie if incorrect (opw 605648)

In case of unparsable cookie (modified, corrupted,...), openerp would not load and crash with white screen until expiration.
With the fix goes back to login screen.

bzr revid: mat@openerp.com-20140327120826-2p6ebnojtmdl1wpm
---

64ecfa40ec898bbfc5f4faa22eee4b98b024e524
diff --cc addons/web/static/src/js/coresetup.js
index 7d37dc2,85c3284..1d6acf1
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@@ -125,7 -125,12 +125,12 @@@ instance.web.Session = instance.web.Jso
          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
++                    // wrong cookie, delete it
+                     this.set_cookie(name, '', -1);
+                 }
              }
          }
          return null;