From c76f7558637ab53cdca1820d8f2e485a28be15ad Mon Sep 17 00:00:00 2001 From: FredyC Date: Sat, 22 Aug 2015 06:09:42 +0200 Subject: [PATCH] safer type checking for iterable structures --- src/react/JSONTree/obj-type.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/react/JSONTree/obj-type.js b/src/react/JSONTree/obj-type.js index 095ee2d7..40dfd8d1 100644 --- a/src/react/JSONTree/obj-type.js +++ b/src/react/JSONTree/obj-type.js @@ -1,7 +1,6 @@ export default function(obj) { - const type = Object.prototype.toString.call(obj).slice(8, -1); - if (type === 'Object' && typeof obj[Symbol.iterator] === 'function') { + if (obj !== null && typeof obj === 'object' && typeof obj[Symbol.iterator] === 'function') { return 'Iterable'; } - return type; + return Object.prototype.toString.call(obj).slice(8, -1); }