From 607caf0454cda589ce0b84eb8d2c8e6b5613aec0 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 23 Mar 2021 21:37:58 +0300
Subject: fix for memory corruption in service mode

---
 src/mir_app/src/chat_manager.cpp | 3 ++-
 src/mir_app/src/chat_opts.cpp    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mir_app/src/chat_manager.cpp b/src/mir_app/src/chat_manager.cpp
index 07c7ecbbf1..b7f7001ae0 100644
--- a/src/mir_app/src/chat_manager.cpp
+++ b/src/mir_app/src/chat_manager.cpp
@@ -968,7 +968,8 @@ MIR_APP_DLL(CHAT_MANAGER*) Chat_CustomizeApi(const CHAT_MANAGER_INITDATA *pInit)
 			g_arSessions.insert(p1);
 		}
 	}
-	if (g_cbModuleInfo) { // reallocate old modules
+	
+	if (g_cbModuleInfo != pInit->cbModuleInfo) { // reallocate old modules
 		bool bReallocated = false;
 		mir_cslock lck(csChat);
 
diff --git a/src/mir_app/src/chat_opts.cpp b/src/mir_app/src/chat_opts.cpp
index b5078a8778..530b82878f 100644
--- a/src/mir_app/src/chat_opts.cpp
+++ b/src/mir_app/src/chat_opts.cpp
@@ -30,7 +30,7 @@ HICON g_hChatIcons[20];
 DWORD g_dwDiskLogFlags;
 HPLUGIN g_pChatPlugin;
 GlobalLogSettingsBase *g_Settings;
-int g_cbSession, g_cbModuleInfo, g_iFontMode;
+int g_cbSession, g_cbModuleInfo = sizeof(MODULEINFO), g_iFontMode;
 wchar_t *g_szFontGroup;
 
 #define FONTF_BOLD   1
-- 
cgit v1.2.3