diff options
| author | George Hazan <ghazan@miranda.im> | 2021-03-23 21:37:58 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2021-03-23 21:37:58 +0300 |
| commit | 607caf0454cda589ce0b84eb8d2c8e6b5613aec0 (patch) | |
| tree | 15d81151b5661d085b0493822b562da92a0fcc60 | |
| parent | 9006db713888054bda241e14dc6c0524860f3b30 (diff) | |
fix for memory corruption in service mode
| -rw-r--r-- | src/mir_app/src/chat_manager.cpp | 3 | ||||
| -rw-r--r-- | 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
|