From 7b0232c11c4172cdba185245350a5fb4831d7f94 Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Fri, 27 Feb 2026 21:20:36 +0100
Subject: [PATCH] wleanup: be a bit more defensive in server_events.c

---
 src/event/server_events.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/event/server_events.c b/src/event/server_events.c
index c877ff31..ca718ef8 100644
--- a/src/event/server_events.c
+++ b/src/event/server_events.c
@@ -603,6 +603,9 @@ _sv_ev_incoming_plain(ProfChatWin* chatwin, gboolean new_win, ProfMessage* messa
     if (message->body) {
         message->enc = PROF_MSG_ENC_NONE;
         message->plain = strdup(message->body);
+        if (message->plain == NULL) {
+            return;
+        }
         _clean_incoming_message(message);
         chatwin_incoming_msg(chatwin, message, new_win);
         log_database_add_incoming(message);
@@ -1309,6 +1312,10 @@ sv_ev_bookmark_autojoin(Bookmark* bookmark)
 static void
 _cut(ProfMessage* message, const char* cut)
 {
+    if (message->plain == NULL) {
+        return;
+    }
+
     if (strstr(message->plain, cut)) {
         auto_gcharv gchar** split = g_strsplit(message->plain, cut, -1);
         free(message->plain);