diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-09-28 19:41:16 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-09-28 19:41:16 +0000 |
| commit | dae0ea5313c8691fcc8f761ac9647b8996c8824c (patch) | |
| tree | 1e13ae35c0898ef035ef975b644107c911acabf6 /protocols/MRA/src/Mra_functions.cpp | |
| parent | bc2780159221f9d9ef825e41d16cfdaa23c956b2 (diff) | |
crash fix in mra
git-svn-id: http://svn.miranda-ng.org/main/trunk@15466 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/MRA/src/Mra_functions.cpp')
| -rw-r--r-- | protocols/MRA/src/Mra_functions.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp index 23b3abe993..bdbae4e273 100644 --- a/protocols/MRA/src/Mra_functions.cpp +++ b/protocols/MRA/src/Mra_functions.cpp @@ -909,24 +909,24 @@ DWORD CMraProto::ProtoBroadcastAckAsync(MCONTACT hContact, int type, int hResult CMStringA CMraProto::CreateBlobFromContact(MCONTACT hContact, const CMStringW &wszRequestReason)
{
- CMStringA res('\0', 8), tmp;
+ CMStringA res('\0', 8);
+ CMStringW tmp;
DWORD *p = (DWORD*)res.c_str();
p[0] = 0; p[1] = (DWORD)hContact;
- mraGetStringA(hContact, "Nick", tmp);
- res += tmp; res.AppendChar(0);
+ mraGetStringW(hContact, "Nick", tmp);
+ res.Append(ptrA(mir_utf8encodeW(tmp))); res.AppendChar(0);
- mraGetStringA(hContact, "FirstName", tmp);
- res += tmp; res.AppendChar(0);
+ mraGetStringW(hContact, "FirstName", tmp);
+ res.Append(ptrA(mir_utf8encodeW(tmp))); res.AppendChar(0);
- mraGetStringA(hContact, "LastName", tmp);
- res += tmp; res.AppendChar(0);
+ mraGetStringW(hContact, "LastName", tmp);
+ res.Append(ptrA(mir_utf8encodeW(tmp))); res.AppendChar(0);
- mraGetStringA(hContact, "e-mail", tmp);
- res += tmp; res.AppendChar(0);
+ mraGetStringW(hContact, "e-mail", tmp);
+ res.Append(ptrA(mir_utf8encodeW(tmp))); res.AppendChar(0);
- tmp = wszRequestReason;
- res += tmp; res.AppendChar(0);
+ res.Append(ptrA(mir_utf8encodeW(wszRequestReason))); res.AppendChar(0);
return res;
}
|