diff options
| author | Robert Pösel <robyer@seznam.cz> | 2013-02-09 09:49:40 +0000 |
|---|---|---|
| committer | Robert Pösel <robyer@seznam.cz> | 2013-02-09 09:49:40 +0000 |
| commit | ce3ab93c2c61a22ac4cd38c05ea9e71e4f9695ae (patch) | |
| tree | beca856ed866bdba40b885c5446b27ee41d4bece /protocols/IcqOscarJ/src/directpackets.cpp | |
| parent | 6494bd1f41a94d784c71ee4e089b76e4baca5761 (diff) | |
ICQ: Added patch from ryo-oh-ki:
1. Compatibility fix for third-party local ICQ servers - ICQ Groupware and IserverD. Added new option in Network -> ICQ -> Account -> "[X] Legacy fix", it's off by default (wont connect to old ICQ servers).
2. Compatibility fix for old non-unicode ICQ clients (crashes on file transfer).
3. Fixed double-freed memory in oscar_filetransfer.cpp (crashes after file transfer).
git-svn-id: http://svn.miranda-ng.org/main/trunk@3499 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/IcqOscarJ/src/directpackets.cpp')
| -rw-r--r-- | protocols/IcqOscarJ/src/directpackets.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/protocols/IcqOscarJ/src/directpackets.cpp b/protocols/IcqOscarJ/src/directpackets.cpp index 594f005675..fa21a949d5 100644 --- a/protocols/IcqOscarJ/src/directpackets.cpp +++ b/protocols/IcqOscarJ/src/directpackets.cpp @@ -151,9 +151,8 @@ void CIcqProto::icq_sendFileDenyDirect(HANDLE hContact, filetransfer *ft, const char *szReasonAnsi = NULL;
int cbReasonAnsi = 0;
- if (!utf8_decode(szReason, &szReasonAnsi))
- szReasonAnsi = NULL;
- else
+ if (!utf8_decode(szReason, &szReasonAnsi))
+ szReasonAnsi = _strdup(szReason); // Legacy fix
cbReasonAnsi = strlennull(szReasonAnsi);
packDirectMsgHeader(&packet, (WORD)(18 + cbReasonAnsi), DIRECT_ACK, ft->dwCookie, MTYPE_FILEREQ, 0, 1, 0);
@@ -181,9 +180,8 @@ int CIcqProto::icq_sendFileSendDirectv7(filetransfer *ft, const char *pszFiles) char *szFilesAnsi = NULL;
WORD wDescrLen = strlennull(ft->szDescription), wFilesLen = 0;
- if (!utf8_decode(pszFiles, &szFilesAnsi))
- szFilesAnsi = NULL;
- else
+ if (!utf8_decode(pszFiles, &szFilesAnsi))
+ szFilesAnsi = _strdup(pszFiles); // Legacy fix
wFilesLen = strlennull(szFilesAnsi);
packDirectMsgHeader(&packet, (WORD)(18 + wDescrLen + wFilesLen), DIRECT_MESSAGE, (WORD)ft->dwCookie, MTYPE_FILEREQ, 0, 0, 0);
@@ -209,9 +207,8 @@ int CIcqProto::icq_sendFileSendDirectv8(filetransfer *ft, const char *pszFiles) char *szFilesAnsi = NULL;
WORD wDescrLen = strlennull(ft->szDescription), wFilesLen = 0;
- if (!utf8_decode(pszFiles, &szFilesAnsi))
- szFilesAnsi = NULL;
- else
+ if (!utf8_decode(pszFiles, &szFilesAnsi))
+ szFilesAnsi = _strdup(pszFiles); // Legacy fix
wFilesLen = strlennull(szFilesAnsi);
packDirectMsgHeader(&packet, (WORD)(0x2E + 22 + wDescrLen + wFilesLen + 1), DIRECT_MESSAGE, (WORD)ft->dwCookie, MTYPE_PLUGIN, 0, 0, 0);
|