diff options
author | George Hazan <george.hazan@gmail.com> | 2013-07-20 21:28:27 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2013-07-20 21:28:27 +0000 |
commit | 71465258cce14f8d417ba31e3010298f7640ac2d (patch) | |
tree | 1fe57d014d8ae844000412429235a0c4297a41dc /protocols/JabberG/src/jabber_adhoc.cpp | |
parent | 5756772ef9e9fd5b4a730d8a16737996cbec55f5 (diff) |
- built-in base64 encode removed;
- various memory allocation issues
git-svn-id: http://svn.miranda-ng.org/main/trunk@5435 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_adhoc.cpp')
-rw-r--r-- | protocols/JabberG/src/jabber_adhoc.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/protocols/JabberG/src/jabber_adhoc.cpp b/protocols/JabberG/src/jabber_adhoc.cpp index b28221f607..222a34e044 100644 --- a/protocols/JabberG/src/jabber_adhoc.cpp +++ b/protocols/JabberG/src/jabber_adhoc.cpp @@ -361,15 +361,12 @@ int CJabberProto::AdHoc_AddCommandRadio(HWND hFrame, TCHAR * labelStr, int id, i static INT_PTR CALLBACK JabberAdHoc_CommandDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
JabberAdHocData* dat = (JabberAdHocData*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
- switch (msg)
- {
+ switch (msg) {
case WM_INITDIALOG:
{
CJabberAdhocStartupParams* pStartupParams = (CJabberAdhocStartupParams *)lParam;
- dat=(JabberAdHocData *)mir_alloc(sizeof(JabberAdHocData));
- memset(dat,0,sizeof(JabberAdHocData));
+ dat=(JabberAdHocData *)mir_calloc(sizeof(JabberAdHocData));
- //hmmm, useless code? if (dat->ResponderJID) mir_free(dat->ResponderJID);
dat->ResponderJID = mir_tstrdup(pStartupParams->m_szJid);
dat->proto = pStartupParams->m_pProto;
|