Merge lp:~openerp-dev/openerp-web/7.0-safer-cookier-mat into lp:openerp-web/7.0

[Martin Trigaux (OpenERP)]

If the cookie is malformed, catch the error and delete it

=== modified file 'addons/web/static/src/js/coresetup.js'
--- addons/web/static/src/js/coresetup.js	2013-07-02 09:39:32 +0000
+++ addons/web/static/src/js/coresetup.js	2014-03-27 12:00:46 +0000
@@ -125,7 +125,12 @@
         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;