Data: Fix persistence handling of null value

WordPress · Aug 3, 2018 · 94a1f4c · 94a1f4c
1 parent 2085eed
commit 94a1f4c
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/packages/data/src/plugins/persistence/index.js b/packages/data/src/plugins/persistence/index.js
@@ -70,11 +70,19 @@ export function createPersistenceInterface( options ) {
 	 */
 	function get() {
 		if ( data === undefined ) {
+			// If unset, getItem is expected to return null. Fall back to
+			// empty object.
 			const persisted = storage.getItem( storageKey );
-			try {
-				data = JSON.parse( persisted );
-			} catch ( error ) {
+			if ( persisted === null ) {
 				data = {};
+			} else {
+				try {
+					data = JSON.parse( persisted );
+				} catch ( error ) {
+					// Similarly, should any error be thrown during parse of
+					// the string (malformed JSON), fall back to empty object.
+					data = {};
+				}
 			}
 		}