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

protect against subtly corrupted user objects

Browse Source
This commit is contained in:
ansuz 2017-03-30 17:19:49 +02:00
parent 7908f3b4f0
commit 9b4b642d4a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/fileObject.js
View File

@ -295,7 +295,7 @@ define([
paths.push(p); paths.push(p);
} }
}; };
if (path.length === 1) { if (path.length === 1 && typeof(root) === 'object') {
Object.keys(root).forEach(function (key) { Object.keys(root).forEach(function (key) {
var arr = root[key]; var arr = root[key];
if (!Array.isArray(arr)) { return; } if (!Array.isArray(arr)) { return; }

1
www/common/mergeDrive.js
View File

@ -152,6 +152,7 @@ define([
var oldFo = FO.init(parsed.drive, { var oldFo = FO.init(parsed.drive, {
Cryptpad: Cryptpad Cryptpad: Cryptpad
}); });
oldFo.fixFiles();
var newData = Cryptpad.getStore().getProxy(); var newData = Cryptpad.getStore().getProxy();
var newFo = newData.fo; var newFo = newData.fo;
var newRecentPads = proxy.drive[Cryptpad.storageKey]; var newRecentPads = proxy.drive[Cryptpad.storageKey];