Protect against malformed JSON data files

Bootjack · Feb 21, 2017 · f1537a1 · f1537a1
1 parent 1672ba8
commit f1537a1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/commands/status.js b/src/commands/status.js
@@ -11,7 +11,7 @@ const initialize = require('../init');
 const {genericErrorHandler} = require('../utils');
 const {itemSummaryFormatter} = require('../formatters');
 
-function createStatusStream(items) {
+function createStatusStream(items = []) {
  return new Readable({
  objectMode: true,
  read() {

diff --git a/src/utils.js b/src/utils.js
@@ -97,16 +97,20 @@ function assignElementPropTypes(schema, element) {
 
 function getSavedElements(filepath, schema) {
  return new Promise((resolve, reject) => {
- fs.readFile(filepath, (err, content) => {
- if (err) {
- if (err.code === 'ENOENT') {
+ fs.readFile(filepath, (readErr, content) => {
+ if (readErr) {
+ if (readErr.code === 'ENOENT') {
  resolve([]);
  } else {
- reject(err);
+ reject(readErr);
  }
  } else {
- const data = JSON.parse(content).map(assignElementPropTypes.bind(this, schema));
- resolve(data);
+ try {
+ const data = JSON.parse(content).map(assignElementPropTypes.bind(this, schema));
+ resolve(data);
+ } catch (parseErr) {
+ reject(`Unable to parse saved data at ${filepath}\n`);
+ }
  }
  });
  });