From 645ec830b0f5914b209020c75c729c51629d8c08 Mon Sep 17 00:00:00 2001
From: Beau Gunderson <beau@beaugunderson.com>
Date: Tue, 18 Nov 2014 13:52:42 -0800
Subject: [PATCH] Don't crash on bad plugins.json; fixes #2323

---
 src/static/js/pluginfw/installer.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/static/js/pluginfw/installer.js b/src/static/js/pluginfw/installer.js
index bf779d7ac..90bd9aa27 100644
--- a/src/static/js/pluginfw/installer.js
+++ b/src/static/js/pluginfw/installer.js
@@ -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)