From a7c7432055af04da515988a1b27cca20ea90e947 Mon Sep 17 00:00:00 2001
From: Jasper Houweling <jasper@familiehouweling.nl>
Date: Sun, 19 Jan 2025 13:33:11 +0100
Subject: [PATCH] Try catch added at call to minifyCriteria in server.js

---
 Framework/Backend/websocket/server.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Framework/Backend/websocket/server.js b/Framework/Backend/websocket/server.js
index f1c069ae6..88ec05d72 100644
--- a/Framework/Backend/websocket/server.js
+++ b/Framework/Backend/websocket/server.js
@@ -147,7 +147,12 @@ class WebSocket {
         // 2. Check if its message filter (no auth required)
         if (parsed.getCommand() == 'filter' && parsed.getPayload()) {
           client.filter = new Function(`return ${parsed.getPayload()}`)();
-          const criterias = minifyCriteria(client.filter(message, true));
+          let criterias;
+          try {
+            criterias = minifyCriteria(client.filter(message, true));
+          } catch {
+            this.logger.errorMessage('Invalid payload criteria received at onmessage()');
+          }
           if (criterias != false) {
             this.logger.debugMessage(`New live filter applied: ${JSON.stringify(criterias)}`);
           }