[Ttssh2-commit] [6535] ブロードキャストコマンドコマンドでゴミが付加される問題を修正 #36784

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2016年 11月 15日 (火) 08:59:25 JST


Revision: 6535
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6535
Author:   doda
Date:     2016-11-15 08:59:24 +0900 (Tue, 15 Nov 2016)
Log Message:
-----------
ブロードキャストコマンドコマンドでゴミが付加される問題を修正 #36784

WM_COPYDATA で渡されたデータは NUL Terminate されてないので、
データコピー時に末尾に NUL を付加する。

Ticket Links:
------------
    http://sourceforge.jp/projects/ttssh2/tracker/detail/36784

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/teraterm/teraterm/clipboar.c

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2016-11-09 15:38:51 UTC (rev 6534)
+++ trunk/doc/en/html/about/history.html	2016-11-14 23:59:24 UTC (rev 6535)
@@ -46,6 +46,7 @@
       <li>When <a href="../menu/file-log.html">Log dialog</a> is closed, the memory leak of Tera Term core(ttermpro.exe) is happened.</li>
       <li>After Kanji(receive) is set to EUC and UTF-8 string is shown, new Kanji(Chinese character) may be properly shown when Kanji(receive)  is set to UTF-8.</li>
       <li>When Kanji(receive) is set to UTF-8, ISO-2022-JP Kanji can not be properly shown with Japanese language setting.</li>
+      <!-- li>\x83u\x83\x8D\x81[\x83h\x83L\x83\x83\x83X\x83g\x83R\x83}\x83\x93\x83h\x82ŁA\x83\x8A\x83A\x83\x8B\x83^\x83C\x83\x80\x83\x82\x81[\x83h\x82\xAA off \x82̎\x9E\x82ɖ\x96\x94\xF6\x82ɗ]\x8Cv\x82ȕ\xB6\x8E\x9A\x97񂪕t\x82\xAD\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li -->
       <li>MACRO: When <a href="../macro/command/closesbox.html">closesbox</a> command is executed, the memory leak of Macro core(ttpmacro.exe) is happened.</li>
       <li>MACRO: The gethostname, gettitle, getmodemstatus, loginfo and logopen command will rarely be wrong.</li>
     </ul>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2016-11-09 15:38:51 UTC (rev 6534)
+++ trunk/doc/ja/html/about/history.html	2016-11-14 23:59:24 UTC (rev 6535)
@@ -46,6 +46,7 @@
       <li><a href="../menu/file-log.html">\x83\x8D\x83O\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xF0\x95‚\xB6\x82\xBD\x8E\x9E\x81ATera Term\x96{\x91\xCC(ttermpro.exe)\x82\xAA\x83\x81\x83\x82\x83\x8A\x83\x8A\x81[\x83N\x82\xB7\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
       <li>\x8E\xF3\x90M\x8A\xBF\x8E\x9A\x83R\x81[\x83h\x82\xAA EUC \x90ݒ\xE8\x82̎\x9E\x82\xC9 UTF-8 \x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x95\\x8E\xA6\x82\xB5\x82\xBD\x8C\xE3\x81AUTF-8 \x90ݒ\xE8\x82ɕύX\x82\xB5\x82\xBD\x8E\x9E\x82Ɋ\xBF\x8E\x9A\x82\xAA\x90\xB3\x82\xB5\x82\xAD\x95\\x8E\xA6\x82\xB3\x82\xEA\x82Ȃ\xAD\x82Ȃ鎖\x82\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
       <li>\x8E\xF3\x90M\x8A\xBF\x8E\x9A\x83R\x81[\x83h\x82\xAA UTF-8 \x90ݒ\xE8\x82̎\x9E\x82\xC9 ISO-2022-JP \x8A\xBF\x8E\x9A\x82\xAA\x95\\x8E\xA6\x8Fo\x97\x88\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B(\x93\xFA\x96{\x8Cꃂ\x81[\x83h\x82̂\xDD)</li>
+      <li>\x83u\x83\x8D\x81[\x83h\x83L\x83\x83\x83X\x83g\x83R\x83}\x83\x93\x83h\x82ŁA\x83\x8A\x83A\x83\x8B\x83^\x83C\x83\x80\x83\x82\x81[\x83h\x82\xAA off \x82̎\x9E\x82ɖ\x96\x94\xF6\x82ɗ]\x8Cv\x82ȕ\xB6\x8E\x9A\x97񂪕t\x82\xAD\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
       <li>MACRO: <a href="../macro/command/closesbox.html">closesbox</a>\x83R\x83}\x83\x93\x83h\x82̎\xC0\x8Ds\x8E\x9E\x81A\x83}\x83N\x83\x8D\x96{\x91\xCC(ttpmacro.exe)\x82\xAA\x83\x81\x83\x82\x83\x8A\x83\x8A\x81[\x83N\x82\xB7\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
       <li>MACRO: gethostname, gettitle, getmodemstatus, loginfo, logopen \x83R\x83}\x83\x93\x83h\x82\xAA\x8AԌ\x87\x82ŃG\x83\x89\x81[\x82ɂȂ\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
     </ul>

Modified: trunk/teraterm/teraterm/clipboar.c
===================================================================
--- trunk/teraterm/teraterm/clipboar.c	2016-11-09 15:38:51 UTC (rev 6534)
+++ trunk/teraterm/teraterm/clipboar.c	2016-11-14 23:59:24 UTC (rev 6535)
@@ -127,9 +127,11 @@
 	CBRetryEcho = FALSE;
 	CBSendCR = FALSE;
 
-	if ((CBMemHandle = GlobalAlloc(GHND, DataSize)) != NULL) {
+	if ((CBMemHandle = GlobalAlloc(GHND, DataSize+1)) != NULL) {
 		if ((CBMemPtr = GlobalLock(CBMemHandle)) != NULL) {
 			memcpy(CBMemPtr, DataPtr, DataSize);
+			// WM_COPYDATA \x82ő\x97\x82\xE7\x82\xEA\x82ė\x88\x82\xBD\x83f\x81[\x83^\x82\xCD NUL Terminate \x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x82̂\xC5 NUL \x82\xF0\x95t\x89\xC1\x82\xB7\x82\xE9
+			CBMemPtr[DataSize] = 0;
 			GlobalUnlock(CBMemHandle);
 			CBMemPtr=NULL;
 			TalkStatus=IdTalkCB;



Ttssh2-commit メーリングリストの案内
Back to archive index