infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Don't store in the drive pads without a hash

pull/1/head
yflory 2017-05-05 11:55:19 +02:00
parent f329726fa4
commit 5a5b02b82b
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -299,10 +299,14 @@ define([
pads.forEach(function (pad, i) {
if (pad && typeof(pad) === 'object') {
var hash = checkObjectData(pad);
if (!hash || !common.parseHash(hash)) { return; }
if (!hash || !common.parseHash(hash)) {
console.error("[Cryptpad.checkRecentPads] pad had unexpected value", pad);
getStore().removeData(i);
return;
}
return pad;
}
console.error("[Cryptpad.migrateRecentPads] pad had unexpected value");
console.error("[Cryptpad.checkRecentPads] pad had unexpected value", pad);
getStore().removeData(i);
});
};
@ -571,7 +575,7 @@ define([
return pad;
});
if (!contains) {
if (!contains && href) {
var data = makePad(href, name);
getStore().pushData(data, function (e) {
if (e) {

5
www/common/userObject.js
View File

@ -883,6 +883,11 @@ define([
toClean.push(el);
return;
}
if (!el.href) {
debug("Rmoving an element in filesData with a missing href.", el);
toClean.push(el);
return;
}
if (rootFiles.indexOf(el.href) === -1) {
debug("An element in filesData was not in ROOT, TEMPLATE or TRASH.", el);
var name = el.title || NEW_FILE_NAME;