fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2324 from beaugunderson/no-crash-on-parse-plugins 

Don't crash on bad plugins.json; fixes #2323
This commit is contained in:
John McLear 2014-11-18 22:16:33 +00:00
parent 135aa3e8fe 645ec830b0
commit 17f6a225c1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/static/js/pluginfw/installer.js
View File

@ -66,7 +66,12 @@ exports.getAvailablePlugins = function(maxCacheAge, cb) {
if(exports.availablePlugins && maxCacheAge && Math.round(+new Date/1000)-cacheTimestamp <= maxCacheAge) {
return cb && cb(null, exports.availablePlugins)
}
plugins = JSON.parse(plugins);
try {
plugins = JSON.parse(plugins);
} catch (err) {
console.error('error parsing plugins.json:', err);
plugins = [];
}
exports.availablePlugins = plugins;
cacheTimestamp = Math.round(+new Date/1000);
cb && cb(null, plugins)