diff options
Diffstat (limited to 'plugins/StatusManager/src/KeepStatus')
| -rw-r--r-- | plugins/StatusManager/src/KeepStatus/keepstatus.cpp | 18 | ||||
| -rw-r--r-- | plugins/StatusManager/src/KeepStatus/ks_options.cpp | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/plugins/StatusManager/src/KeepStatus/keepstatus.cpp b/plugins/StatusManager/src/KeepStatus/keepstatus.cpp index bbdc6587c7..31e95c3d0b 100644 --- a/plugins/StatusManager/src/KeepStatus/keepstatus.cpp +++ b/plugins/StatusManager/src/KeepStatus/keepstatus.cpp @@ -130,14 +130,14 @@ int KSLoadOptions() static PROTOCOLSETTINGEX** GetCurrentProtoSettingsCopy() { mir_cslock lck(GenStatusCS); - PROTOCOLSETTINGEX **ps = (PROTOCOLSETTINGEX**)malloc(protoList.getCount() * sizeof(PROTOCOLSETTINGEX *)); + PROTOCOLSETTINGEX **ps = (PROTOCOLSETTINGEX**)mir_alloc(protoList.getCount() * sizeof(PROTOCOLSETTINGEX *)); if (ps == nullptr) { return nullptr; } for (int i = 0; i < protoList.getCount(); i++) { - ps[i] = (PROTOCOLSETTINGEX*)calloc(1, sizeof(PROTOCOLSETTINGEX)); + ps[i] = (PROTOCOLSETTINGEX*)mir_calloc(sizeof(PROTOCOLSETTINGEX)); if (ps[i] == nullptr) { - free(ps); + mir_free(ps); return nullptr; } @@ -156,10 +156,10 @@ static void FreeProtoSettings(PROTOCOLSETTINGEX** ps) { for (int i = 0; i < protoList.getCount(); i++) { if (ps[i]->m_szMsg != nullptr) - free(ps[i]->m_szMsg); - free(ps[i]); + mir_free(ps[i]->m_szMsg); + mir_free(ps[i]); } - free(ps); + mir_free(ps); } int SMProto::AssignStatus(int iStatus, int iLastStatus, wchar_t *pwszMsg) @@ -187,13 +187,13 @@ int SMProto::AssignStatus(int iStatus, int iLastStatus, wchar_t *pwszMsg) if (pwszMsg != nullptr && mir_wstrcmp(pwszMsg, m_szMsg)) { if (m_szMsg != nullptr) - free(m_szMsg); + mir_free(m_szMsg); - m_szMsg = wcsdup(pwszMsg); + m_szMsg = mir_wstrdup(pwszMsg); } else if (pwszMsg != m_szMsg) { if (m_szMsg != nullptr) - free(m_szMsg); + mir_free(m_szMsg); m_szMsg = nullptr; } diff --git a/plugins/StatusManager/src/KeepStatus/ks_options.cpp b/plugins/StatusManager/src/KeepStatus/ks_options.cpp index 7fb763b926..8931d9c01e 100644 --- a/plugins/StatusManager/src/KeepStatus/ks_options.cpp +++ b/plugins/StatusManager/src/KeepStatus/ks_options.cpp @@ -136,7 +136,7 @@ static INT_PTR CALLBACK DlgProcKSBasicOpts(HWND hwndDlg, UINT msg, WPARAM wParam int len = SendDlgItemMessage(hwndDlg, IDC_PINGHOST, WM_GETTEXTLENGTH, 0, 0); if (len > 0) { - host = (char*)malloc(len + 1); + host = (char*)mir_alloc(len + 1); if (host != nullptr) { memset(host, '\0', len + 1); GetDlgItemTextA(hwndDlg, IDC_PINGHOST, host, len + 1); |