From b67c40f21c0fe0c80a3ddd31b0b09f71bf5d97d7 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 14 Aug 2013 19:04:55 +0000 Subject: mir_*printf patch for protocols git-svn-id: http://svn.miranda-ng.org/main/trunk@5690 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_util.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'protocols/JabberG/src/jabber_util.cpp') diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp index 2a319cd7ea..f9488f09d9 100644 --- a/protocols/JabberG/src/jabber_util.cpp +++ b/protocols/JabberG/src/jabber_util.cpp @@ -350,7 +350,7 @@ char* __stdcall JabberSha1(char* str) char *result = (char*)mir_alloc(41); if (result) for (int i=0; i < 20; i++) - sprintf(result+(i<<1), "%02x", digest[i]); + mir_snprintf(result + (i << 1), 2, "%02x", digest[i]); return result; } @@ -442,13 +442,14 @@ TCHAR* __stdcall JabberHttpUrlEncode(const TCHAR *str) TCHAR *p, *q, *res; if (str == NULL) return NULL; - res = (TCHAR*) mir_alloc(3*_tcslen(str) + 1); + size_t size = 3 * _tcslen(str) + 1; + res = (TCHAR *)mir_alloc(size); for (p = (TCHAR*)str, q = res; *p!='\0'; p++,q++) { if ((*p>='A' && *p<='Z') || (*p>='a' && *p<='z') || (*p>='0' && *p<='9') || strchr("$-_.+!*'(),", *p) != NULL) { *q = *p; } else { - wsprintf(q, _T("%%%02X"), *p); + mir_sntprintf(q, size, _T("%%%02X"), *p); q += 2; } } @@ -886,7 +887,7 @@ void __stdcall JabberStringAppend(char* *str, int *sizeAlloced, const char* fmt, p = *str + len; va_start(vararg, fmt); - while (_vsnprintf(p, size, fmt, vararg) == -1) { + while (mir_vsnprintf(p, size, fmt, vararg) == -1) { size += 2048; (*sizeAlloced) += 2048; *str = (char*)mir_realloc(*str, *sizeAlloced); @@ -1651,7 +1652,7 @@ void __cdecl CJabberProto::LoadHttpAvatars(void* param) mir_sha1_append(&sha, (mir_sha1_byte_t*)res->pData, res->dataLength); mir_sha1_finish(&sha, digest); for (int i=0; i<20; i++) - sprintf(buffer+(i<<1), "%02x", digest[i]); + mir_snprintf(buffer + (i << 1), 2, "%02x", digest[i]); ptrA cmpsha( getStringA(AI.hContact, "AvatarSaved")); if (cmpsha == NULL || strnicmp(cmpsha, buffer, sizeof(buffer))) { -- cgit v1.2.3