Merge 2045a90 into a13eb6e

node-modules · Aug 21, 2015 · 7756384 · 7756384
2 parents a13eb6e + 2045a90
commit 7756384
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/lib/json.js b/lib/json.js
@@ -10,10 +10,22 @@
  * Module dependencies.
  */
 
+function throwNotObject() {
+  throw new Error('JSON string is not object');
+}
+
 exports.strictJSONParse = function (str) {
-  var obj = JSON.parse(str);
-  if (!obj || typeof obj !== 'object') {
-    throw new Error('JSON string is not object');
+  if (str === '') {
+    return throwNotObject();
+  }
+
+  str = str.trim();
+
+  if (str[0] !== '{') {
+    return throwNotObject();
   }
+
+  var obj = JSON.parse(str);
+
   return obj;
 };
diff --git a/test/json.test.js b/test/json.test.js
@@ -22,6 +22,13 @@ describe('json.test.js', function () {
       obj.should.eql({foo: 'bar'});
     });
 
+
+    it('should parse error when invalid json', function () {
+      (function () {
+        utils.strictJSONParse('[]');
+      }).should.throw();
+    });
+
     it('should parse error when invalid json', function () {
       (function () {
         utils.strictJSONParse('{');