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_vcard.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_vcard.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_vcard.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/protocols/JabberG/src/jabber_vcard.cpp b/protocols/JabberG/src/jabber_vcard.cpp index 39dc3a6799..566c276bf2 100644 --- a/protocols/JabberG/src/jabber_vcard.cpp +++ b/protocols/JabberG/src/jabber_vcard.cpp @@ -1155,7 +1155,7 @@ void CJabberProto::SetServerVcard(BOOL bPhotoChanged, TCHAR* szPhotoFileName) if ((hFile=CreateFile(szFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL)) != INVALID_HANDLE_VALUE) {
if ((buffer=(char*)mir_alloc(st.st_size)) != NULL) {
if (ReadFile(hFile, buffer, st.st_size, &nRead, NULL)) {
- if ((str=JabberBase64Encode(buffer, nRead)) != NULL) {
+ if ((str=mir_base64_encode((PBYTE)buffer, nRead)) != NULL) {
n = v << XCHILD(_T("PHOTO"));
TCHAR *szFileType;
switch(JabberGetPictureType(buffer)) {
|