From 6e2b6b31bae6d69bff5271451e73eb08637b8118 Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Tue, 2 Dec 2014 03:47:27 +0000 Subject: mir_sntprintf(..., _T("%s"), ...) -> _tcsncpy_s(..., ..., _TRUNCATE) fix some x64 ptr truncations git-svn-id: http://svn.miranda-ng.org/main/trunk@11211 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Weather/src/weather_conv.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/Weather') diff --git a/plugins/Weather/src/weather_conv.cpp b/plugins/Weather/src/weather_conv.cpp index c375c9d95f..4a0a734392 100644 --- a/plugins/Weather/src/weather_conv.cpp +++ b/plugins/Weather/src/weather_conv.cpp @@ -109,7 +109,7 @@ void GetTemp(TCHAR *tempchar, TCHAR *unit, TCHAR* str) // rounding numToStr((temp-32)/9*5, tstr, SIZEOF(tstr)); if (opt.DoNotAppendUnit) - mir_sntprintf(str, MAX_DATA_LEN, _T("%s"), tstr); + _tcsncpy_s(str, MAX_DATA_LEN, tstr, _TRUNCATE); else mir_sntprintf(str, MAX_DATA_LEN, _T("%s%sC"), tstr, opt.DegreeSign); break; @@ -117,7 +117,7 @@ void GetTemp(TCHAR *tempchar, TCHAR *unit, TCHAR* str) case 2: numToStr(temp, tstr, SIZEOF(tstr)); if (opt.DoNotAppendUnit) - mir_sntprintf(str, MAX_DATA_LEN, _T("%s"), tstr); + _tcsncpy_s(str, MAX_DATA_LEN, tstr, _TRUNCATE); else mir_sntprintf(str, MAX_DATA_LEN, _T("%s%sF"), tstr, opt.DegreeSign); break; @@ -394,8 +394,8 @@ WORD GetIcon(const TCHAR* cond, WIDATA *Data) j++; // using the format _T("# Weather #" mir_sntprintf(LangPackStr, SIZEOF(LangPackStr), _T("# Weather %s %i #"), statusStr[i], j); - mir_sntprintf(LangPackStr1, SIZEOF(LangPackStr1), _T("%s"), TranslateTS(LangPackStr)); - CharLowerBuff(LangPackStr1, (DWORD)_tcslen(LangPackStr1)); + _tcsncpy_s(LangPackStr1, TranslateTS(LangPackStr), _TRUNCATE); + CharLowerBuff(LangPackStr1, _tcslen(LangPackStr1)); if (_tcsstr(cond, LangPackStr1) != NULL) return statusValue[i]; // loop until the translation string exists (ie, the translated string is differ from original) -- cgit v1.2.3