From c62ba7b8f551e464e9b217db60a9613baca64f1e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 30 Jan 2013 14:56:20 +0000 Subject: fix to prevent C++ runtime from shutting down Miranda due to wrong data formats etc git-svn-id: http://svn.miranda-ng.org/main/trunk@3368 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Scriver/src/chat/log.cpp | 6 +++--- plugins/TabSRMM/src/chat/log.cpp | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'plugins') diff --git a/plugins/Scriver/src/chat/log.cpp b/plugins/Scriver/src/chat/log.cpp index 7cffea1360..7b886c0ee3 100644 --- a/plugins/Scriver/src/chat/log.cpp +++ b/plugins/Scriver/src/chat/log.cpp @@ -580,7 +580,8 @@ static void LogEventIEView(LOGSTREAMDATA *streamData, TCHAR *ptszNick) TCHAR* MakeTimeStamp( TCHAR* pszStamp, time_t time) { static TCHAR szTime[30]; - _tcsftime(szTime, 29, pszStamp, localtime(&time)); + if ( !_tcsftime(szTime, SIZEOF(szTime)-1, pszStamp, localtime(&time))) + _tcsncpy(szTime, TranslateT(""), SIZEOF(szTime)); return szTime; } @@ -973,7 +974,6 @@ void LoadMsgLogBitmaps(void) void FreeMsgLogBitmaps(void) { - int i; - for (i = 0; i < SIZEOF(pLogIconBmpBits); i++) + for (int i = 0; i < SIZEOF(pLogIconBmpBits); i++) mir_free(pLogIconBmpBits[i]); } diff --git a/plugins/TabSRMM/src/chat/log.cpp b/plugins/TabSRMM/src/chat/log.cpp index a421c1aefb..a6cfde546c 100644 --- a/plugins/TabSRMM/src/chat/log.cpp +++ b/plugins/TabSRMM/src/chat/log.cpp @@ -750,7 +750,8 @@ static void AddEventToBuffer(char **buffer, int *bufferEnd, int *bufferAlloced, TCHAR* MakeTimeStamp(TCHAR* pszStamp, time_t time) { static TCHAR szTime[30]; - _tcsftime(szTime, 29, pszStamp, localtime(&time)); + if ( !_tcsftime(szTime, SIZEOF(szTime)-1, pszStamp, localtime(&time))) + _tcsncpy(szTime, TranslateT(""), SIZEOF(szTime)); return szTime; } -- cgit v1.2.3