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/fam_02location.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/fam_02location.cpp')
| -rw-r--r-- | protocols/IcqOscarJ/src/fam_02location.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/protocols/IcqOscarJ/src/fam_02location.cpp b/protocols/IcqOscarJ/src/fam_02location.cpp index a4b8601e78..9e1fdd2ad6 100644 --- a/protocols/IcqOscarJ/src/fam_02location.cpp +++ b/protocols/IcqOscarJ/src/fam_02location.cpp @@ -89,7 +89,8 @@ static char* AimApplyEncoding(char* pszStr, const char* pszEncoding) char *szRes = NULL;
SAFE_FREE((void**)&pszStr);
- utf8_decode(szStr, &szRes);
+ if (!utf8_decode(szStr, &szRes))
+ szRes = _strdup(szStr); // Legacy fix
SAFE_FREE((void**)&szStr);
return szRes;
|