Treat null as a valid plain object prototype in isPlainObject() (#…

…1075) Fixes #1074
reduxjs · Nov 10, 2018 · 8987de0 · 8987de0
1 parent 59aaba5
commit 8987de0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/utils/isPlainObject.js b/src/utils/isPlainObject.js
@@ -5,10 +5,13 @@
 export default function isPlainObject(obj) {
   if (typeof obj !== 'object' || obj === null) return false
 
-  let proto = obj
-  while (Object.getPrototypeOf(proto) !== null) {
-    proto = Object.getPrototypeOf(proto)
+  let proto = Object.getPrototypeOf(obj)
+  if (proto === null) return true
+
+  let baseProto = proto
+  while (Object.getPrototypeOf(baseProto) !== null) {
+    baseProto = Object.getPrototypeOf(baseProto)
   }
 
-  return Object.getPrototypeOf(obj) === proto
+  return proto === baseProto
 }
diff --git a/test/utils/isPlainObject.spec.js b/test/utils/isPlainObject.spec.js
@@ -17,5 +17,6 @@ describe('isPlainObject', () => {
     expect(isPlainObject(null)).toBe(false)
     expect(isPlainObject()).toBe(false)
     expect(isPlainObject({ x: 1, y: 2 })).toBe(true)
+    expect(isPlainObject(Object.create(null))).toBe(true)
   })
 })