From 5c828c53284acc724a5d1e17f8d094b4045afe95 Mon Sep 17 00:00:00 2001
From: ymc9 <104139426+ymc9@users.noreply.github.com>
Date: Thu, 31 Oct 2024 16:04:27 -0700
Subject: [PATCH] fix(hooks): add null check to data before further
 deserialization

---
 packages/plugins/swr/src/runtime/index.ts             | 2 +-
 packages/plugins/tanstack-query/src/runtime/common.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/plugins/swr/src/runtime/index.ts b/packages/plugins/swr/src/runtime/index.ts
index 0ca4212cc..0d25c6709 100644
--- a/packages/plugins/swr/src/runtime/index.ts
+++ b/packages/plugins/swr/src/runtime/index.ts
@@ -420,7 +420,7 @@ function marshal(value: unknown) {
 
 function unmarshal(value: string) {
     const parsed = JSON.parse(value);
-    if (parsed.data && parsed.meta?.serialization) {
+    if (typeof parsed === 'object' && parsed?.data && parsed?.meta?.serialization) {
         const deserializedData = deserialize(parsed.data, parsed.meta.serialization);
         return { ...parsed, data: deserializedData };
     } else {
diff --git a/packages/plugins/tanstack-query/src/runtime/common.ts b/packages/plugins/tanstack-query/src/runtime/common.ts
index 2d6793c8a..946963888 100644
--- a/packages/plugins/tanstack-query/src/runtime/common.ts
+++ b/packages/plugins/tanstack-query/src/runtime/common.ts
@@ -213,7 +213,7 @@ export function marshal(value: unknown) {
 
 export function unmarshal(value: string) {
     const parsed = JSON.parse(value);
-    if (parsed.data && parsed.meta?.serialization) {
+    if (typeof parsed === 'object' && parsed?.data && parsed?.meta?.serialization) {
         const deserializedData = deserialize(parsed.data, parsed.meta.serialization);
         return { ...parsed, data: deserializedData };
     } else {