Tera TermRevision: 7979
https://osdn.net/projects/ttssh2/scm/svn/commits/7979
Author: yutakapon
Date: 2019-08-17 13:58:08 +0900 (Sat, 17 Aug 2019)
Log Message:
-----------
trunkからリビジョン7978をマージ:
英語版WindowsでTera Termの起動時にアプリケーションフォルトとなることがある問題を修正した。
英語版Windows95/NT4.0でsetlocaleがNULLを返すことで、NULLポインタアクセスで落ちる。
ただし、英語版Windows95でもstrrchrにNULLを渡しているにも関わらず、落ちない場合もある。
........
Modified Paths:
--------------
branches/openssl_1_1_1_v2/teraterm/teraterm/vtterm.c
Property Changed:
----------------
branches/openssl_1_1_1_v2/
branches/openssl_1_1_1_v2/teraterm/
-------------- next part --------------
Index: branches/openssl_1_1_1_v2
===================================================================
--- branches/openssl_1_1_1_v2 2019-08-17 04:54:13 UTC (rev 7978)
+++ branches/openssl_1_1_1_v2 2019-08-17 04:58:08 UTC (rev 7979)
Property changes on: branches/openssl_1_1_1_v2
___________________________________________________________________
Modified: svn:mergeinfo
## -2,4 +2,4 ##
/branches/ssh_ed25519:5495-5544
/branches/vs2015_warn:6194-6285
/tags/teraterm-4_89:6182
-/trunk:7893
\ No newline at end of property
+/trunk:7893,7978
\ No newline at end of property
Index: branches/openssl_1_1_1_v2/teraterm
===================================================================
--- branches/openssl_1_1_1_v2/teraterm 2019-08-17 04:54:13 UTC (rev 7978)
+++ branches/openssl_1_1_1_v2/teraterm 2019-08-17 04:58:08 UTC (rev 7979)
Property changes on: branches/openssl_1_1_1_v2/teraterm
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,3 ##
/branches/drag_and_drop/teraterm:7130,7139,7141,7143-7147
-/branches/vs2015_warn/teraterm:6194-6285
\ No newline at end of property
+/branches/vs2015_warn/teraterm:6194-6285
+/trunk/teraterm:7978
\ No newline at end of property
Modified: branches/openssl_1_1_1_v2/teraterm/teraterm/vtterm.c
===================================================================
--- branches/openssl_1_1_1_v2/teraterm/teraterm/vtterm.c 2019-08-17 04:54:13 UTC (rev 7978)
+++ branches/openssl_1_1_1_v2/teraterm/teraterm/vtterm.c 2019-08-17 04:58:08 UTC (rev 7979)
@@ -400,7 +400,11 @@
strcpy(ts.Locale, DEFAULT_LOCALE);
result = setlocale(LC_ALL, ts.Locale);
}
- ts.CodePage = atoi(strrchr(result, '.')+1);
+ // \x89p\x8C\xEA\x94\xC5Windows95/NT4.0\x82ł́Ats.Locale\x82\xAA\x83f\x83t\x83H\x83\x8B\x83g\x82\xCC"japanese"\x82\xBE\x82\xC1\x82\xBD\x8Fꍇ\x81A
+ // setlocale\x82\xAA NULL \x82\xF0\x95Ԃ\xB7\x82\xBD\x82߁ATera Term\x82̋N\x93\xAE\x8E\x9E\x82ɗ\x8E\x82\xBF\x82邱\x82Ƃ\xAA\x82\xA0\x82\xE9\x81B
+ // setlocale \x82ɐ\xAC\x8C\x{1C2D42}\xBD\x8E\x9E\x82̂݁A\x83R\x81[\x83h\x83y\x81[\x83W\x82\xF0\x90ݒ肷\x82\xE9\x81B
+ if (result)
+ ts.CodePage = atoi(strrchr(result, '.')+1);
}
void ResetKeypadMode(BOOL DisabledModeOnly)