提交: cf3755e6ea7a142332bc877b4d0a6b9a16c2b37b - Tera_Term_Testing (git)

Tera Termの個人的な作業用リポジトリ

Commit MetaInfo

• 修订版: cf3755e6ea7a142332bc877b4d0a6b9a16c2b37b (tree)
• 时间: 2023-10-08 15:24:34
• 作者: zmatsuo <zmatsuo@user...>
• Commiter: zmatsuo

Log Message

文字列を返す関数の文字領域を動的確保するよう変更

- 複数スレッドを使用している箇所でログが壊れたり不正な処理で終了することがあった
- ログ出力時に使用していた関数が文字領域を静的に持っていた
- マルチスレッドで使用していると文字領域を破壊することがある
- 返す文字領域を動的にして不要になったらfree()するよう仕様を変更

MFT r10958

git-svn-id: svn+ssh://svn.osdn.net/svnroot/ttssh2/branches/4-stable@10963 f5f01b69-1e22-0410-acbf-894ab4bd6246

更改概述

• modified: teraterm/common/ttlib.c
• modified: teraterm/common/ttlib.h
• modified: teraterm/teraterm/filesys.cpp
• modified: ttssh2/ttxssh/ttxssh.c

差异

--- a/teraterm/common/ttlib.c
+++ b/teraterm/common/ttlib.c
@@ -38,6 +38,11 @@
 #include <ctype.h>
 #include <mbctype.h>	// for _ismbblead
 #include <assert.h>
+#if !defined(_CRTDBG_MAP_ALLOC)
+#define _CRTDBG_MAP_ALLOC
+#endif
+#include <stdlib.h>
+#include <crtdbg.h>
 
 #include "teraterm_conf.h"
 #include "teraterm.h"
@@ -1525,13 +1530,25 @@ int KanjiCodeTranslate(int lang, int kcode)
 	return Table[lang][kcode];
 }
 
-char *mctimelocal(char *format, BOOL utc_flag)
+/*
+ *	現在の時間を文字列にして返す
+ *
+ *	@return	経過時刻文字列
+ *			不要になったらfree()すること
+ */
+char *mctimelocal(const char *format, BOOL utc_flag)
 {
 	SYSTEMTIME systime;
-	static char strtime[29];
-	char week[][4] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
-	char month[][4] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-	                   "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+	const size_t sizeof_strtime = 29;
+	char *strtime = malloc(sizeof_strtime);
+	*strtime = '\0';
+	static const char week[][4] = {
+		"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+	};
+	static const char month[][4] = {
+		"Jan", "Feb", "Mar", "Apr", "May", "Jun",
+		"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+	};
 	char tmp[5];
 	unsigned int i = strlen(format);
 
@@ -1541,88 +1558,94 @@ char *mctimelocal(char *format, BOOL utc_flag)
 	else {
 		GetLocalTime(&systime);
 	}
-	memset(strtime, 0, sizeof(strtime));
 	for (i=0; i<strlen(format); i++) {
 		if (format[i] == '%') {
 			char c = format[i + 1];
 			switch (c) {
 				case 'a':
 					_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%s", week[systime.wDayOfWeek]);
-					strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+					strncat_s(strtime, sizeof_strtime, tmp, _TRUNCATE);
 					i++;
 					break;
 				case 'b':
 					_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%s", month[systime.wMonth - 1]);
-					strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+					strncat_s(strtime, sizeof_strtime, tmp, _TRUNCATE);
 					i++;
 					break;
 				case 'd':
 					_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%02d", systime.wDay);
-					strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+					strncat_s(strtime, sizeof_strtime, tmp, _TRUNCATE);
 					i++;
 					break;
 				case 'e':
 					_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%2d", systime.wDay);
-					strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+					strncat_s(strtime, sizeof_strtime, tmp, _TRUNCATE);
 					i++;
 					break;
 				case 'H':
 					_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%02d", systime.wHour);
-					strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+					strncat_s(strtime, sizeof_strtime, tmp, _TRUNCATE);
 					i++;
 					break;
 				case 'N':
 					_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%03d", systime.wMilliseconds);
-					strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+					strncat_s(strtime, sizeof_strtime, tmp, _TRUNCATE);
 					i++;
 					break;
 				case 'm':
 					_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%02d", systime.wMonth);
-					strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+					strncat_s(strtime, sizeof_strtime, tmp, _TRUNCATE);
 					i++;
 					break;
 				case 'M':
 					_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%02d", systime.wMinute);
-					strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+					strncat_s(strtime, sizeof_strtime, tmp, _TRUNCATE);
 					i++;
 					break;
 				case 'S':
 					_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%02d", systime.wSecond);
-					strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+					strncat_s(strtime, sizeof_strtime, tmp, _TRUNCATE);
 					i++;
 					break;
 				case 'w':
 					_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%d", systime.wDayOfWeek);
-					strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+					strncat_s(strtime, sizeof_strtime, tmp, _TRUNCATE);
 					i++;
 					break;
 				case 'Y':
 					_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%04d", systime.wYear);
-					strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+					strncat_s(strtime, sizeof_strtime, tmp, _TRUNCATE);
 					i++;
 					break;
 				case '%':
-					strncat_s(strtime, sizeof(strtime), "%", _TRUNCATE);
+					strncat_s(strtime, sizeof_strtime, "%", _TRUNCATE);
 					i++;
 					break;
 				default:
 					_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%c", format[i]);
-					strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+					strncat_s(strtime, sizeof_strtime, tmp, _TRUNCATE);
 					break;
 			}
 		}
 		else {
 			_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%c", format[i]);
-			strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+			strncat_s(strtime, sizeof_strtime, tmp, _TRUNCATE);
 		}
 	}
 
 	return strtime;
 }
 
+/*
+ *	現在までの経過時間を文字列にして返す
+ *
+ *	@return	経過時間の文字列
+ *			不要になったらfree()すること
+ */
 char *strelapsed(DWORD start_time)
 {
-	static char strtime[20];
+	size_t sizeof_strtime = 20;
+	char *strtime = malloc(sizeof_strtime);
 	int days, hours, minutes, seconds, msecs;
 	DWORD delta = GetTickCount() - start_time;
 
@@ -1638,7 +1661,7 @@ char *strelapsed(DWORD start_time)
 	hours = delta % 24;
 	days = delta / 24;
 
-	_snprintf_s(strtime, sizeof(strtime), _TRUNCATE,
+	_snprintf_s(strtime, sizeof_strtime, _TRUNCATE,
 		"%d %02d:%02d:%02d.%03d",
 		days, hours, minutes, seconds, msecs);
 

--- a/teraterm/common/ttlib.h
+++ b/teraterm/common/ttlib.h
@@ -102,7 +102,7 @@ DllExport BOOL HasBalloonTipSupport();
 int KanjiCode2List(int lang, int kcode);
 int List2KanjiCode(int lang, int kcode);
 int KanjiCodeTranslate(int lang, int kcode);
-DllExport char *mctimelocal(char *format, BOOL utc_flag);
+DllExport char *mctimelocal(const char *format, BOOL utc_flag);
 char *strelapsed(DWORD start_time);
 
 void b64encode(PCHAR dst, int dsize, PCHAR src, int len);

--- a/teraterm/teraterm/filesys.cpp
+++ b/teraterm/teraterm/filesys.cpp
@@ -1015,6 +1015,7 @@ void LogToFile()
 					strncat_s(tmp, sizeof(tmp), "[", _TRUNCATE);
 					strncat_s(tmp, sizeof(tmp), strtime, _TRUNCATE);
 					strncat_s(tmp, sizeof(tmp), "] ", _TRUNCATE);
+					free(strtime);
 				}
 
 				/* 2007.05.24 Gentaro */

--- a/ttssh2/ttxssh/ttxssh.c
+++ b/ttssh2/ttxssh/ttxssh.c
@@ -831,6 +831,7 @@ void logputs(int level, char *msg)
 			_write(file, msg, strlen(msg));
 			_write(file, "\n", 1);
 			_close(file);
+			free(strtime);
 		}
 	}
 }