From e2317d13f1c3011d7ae29d3913645235eb301703 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 13 Jul 2020 19:55:55 +0300
Subject: fix for very rare crash in clist_modern

---
 plugins/Clist_nicer/src/clcitems.cpp | 2 +-
 plugins/TabSRMM/src/mim.cpp          | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp
index 4af2ec939d..24051ebebf 100644
--- a/plugins/Clist_nicer/src/clcitems.cpp
+++ b/plugins/Clist_nicer/src/clcitems.cpp
@@ -403,7 +403,7 @@ int CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szProto, struct ClcData
 		mir_snprintf(szTemp, "%s|", szProto);
 		filterResult = strstr(cfg::dat.protoFilter, szTemp) ? 1 : 0;
 	}
-	
+
 	if (cfg::dat.bFilterEffective & CLVM_FILTER_GROUPS) {
 		ptrW tszGroup(Clist_GetGroup(hContact));
 		if (tszGroup != NULL) {
diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp
index 00054758b2..0c5708fe4e 100644
--- a/plugins/TabSRMM/src/mim.cpp
+++ b/plugins/TabSRMM/src/mim.cpp
@@ -390,6 +390,9 @@ int CMimAPI::DispatchNewEvent(WPARAM hContact, LPARAM hDbEvent)
 
 int CMimAPI::MessageEventAdded(WPARAM hContact, LPARAM hDbEvent)
 {
+	if (hContact == 0)
+		return 0;
+
 	DBEVENTINFO dbei = {};
 	db_event_get(hDbEvent, &dbei);
 
-- 
cgit v1.2.3