web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the storage when the hash is invalid

Browse Source
This commit is contained in:
yflory 2017-02-13 17:54:01 +01:00
parent 318cec5f91
commit aae3fba284
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
www/common/cryptpad-common.js
View File

@ -367,13 +367,15 @@ define([
if (/^https*:\/\//.test(pad.href)) { if (/^https*:\/\//.test(pad.href)) {
pad.href = common.getRelativeHref(pad.href); pad.href = common.getRelativeHref(pad.href);
} }
var hash = pad.href.slice(pad.href.indexOf('#')+1);
if (!hash || !common.parseHash(hash)) { return; }
return pad; return pad;
} else { } else {
console.error("[Cryptpad.migrateRecentPads] pad had unexpected value"); console.error("[Cryptpad.migrateRecentPads] pad had unexpected value");
console.log(pad); console.log(pad);
return {}; return {};
} }
}); }).filter(function (x) { return x; });
}; };
// Get the pads from localStorage to migrate them to the object store // Get the pads from localStorage to migrate them to the object store
@ -588,6 +590,9 @@ define([
// Edit > Edit (present) > View > View (present) // Edit > Edit (present) > View > View (present)
var pHash = parseHash(p.hash); var pHash = parseHash(p.hash);
var parsedHash = parseHash(parsed.hash); var parsedHash = parseHash(parsed.hash);
if (!pHash) { return; } // We may have a corrupted pad in our storage, abort here in that case
if (!shouldUpdate && pHash.version === 1 && parsedHash.version === 1 && pHash.channel === parsedHash.channel) { if (!shouldUpdate && pHash.version === 1 && parsedHash.version === 1 && pHash.channel === parsedHash.channel) {
if (pHash.mode === 'view' && parsedHash.mode === 'edit') { shouldUpdate = true; } if (pHash.mode === 'view' && parsedHash.mode === 'edit') { shouldUpdate = true; }
else if (pHash.mode === parsedHash.mode && pHash.present) { shouldUpdate = true; } else if (pHash.mode === parsedHash.mode && pHash.present) { shouldUpdate = true; }