Correctly check object for events

stumbled ober an destruction error for "undefined" payload
project-chip · Dec 28, 2024 · 96b6691 · 96b6691
1 parent 125c9ba
commit 96b6691
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/packages/protocol/src/events/OccurrenceManager.ts b/packages/protocol/src/events/OccurrenceManager.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { asyncNew, Construction, ImplementationError, Logger, MaybePromise } from "#general";
+import { asyncNew, Construction, ImplementationError, isObject, Logger, MaybePromise } from "#general";
 import {
     EventNumber,
     EventPriority,
@@ -158,7 +158,10 @@ export class OccurrenceManager {
         if (filterForFabricIndex !== undefined) {
             result = MaybePromise.then(result, (occurrences: NumberedOccurrence[]) =>
                 occurrences.filter(({ payload }) => {
-                    const { fabricIndex } = payload as any;
+                    if (!isObject(payload)) {
+                        return true;
+                    }
+                    const { fabricIndex } = payload;
                     return fabricIndex === undefined || fabricIndex === filterForFabricIndex;
                 }),
             );