Revision: 8031 https://osdn.net/projects/ttssh2/scm/svn/commits/8031 Author: yutakapon Date: 2019-08-29 20:32:26 +0900 (Thu, 29 Aug 2019) Log Message: ----------- SSH2のチャネルをクローズする際、SCP受信用リソースをSCP送信時にも解放していた問題を修正した。 Windows9xでは100%の確率で、SCP送信および受信時にTera Termがクラッシュする。 NT系では再現しない。 Modified Paths: -------------- trunk/doc/en/html/about/history.html trunk/doc/ja/html/about/history.html trunk/ttssh2/ttxssh/ssh.c -------------- next part -------------- Modified: trunk/doc/en/html/about/history.html =================================================================== --- trunk/doc/en/html/about/history.html 2019-08-28 15:34:58 UTC (rev 8030) +++ trunk/doc/en/html/about/history.html 2019-08-29 11:32:26 UTC (rev 8031) @@ -3176,6 +3176,7 @@ <ul> <li>SSH2: When SSH communication is slow by using port forwarding, an application fault is occurred due to increase memory consumption.</li> <li>SSH2: When SCP transfer dialog is closed, the directory of file transfer setting and the SCP destination path setting may not be updated.</li> + <li>SSH2: When SCP transfer is started on Windows 95/98/Me, an application fault occurs.</li> <li>SSH1: When the destination port number is other than 22, an application fault may be occurred after the host key is newly written to known_hosts file.</li> <li>SSH1: The rhosts authentication could not be performed at all.</li> </ul> Modified: trunk/doc/ja/html/about/history.html =================================================================== --- trunk/doc/ja/html/about/history.html 2019-08-28 15:34:58 UTC (rev 8030) +++ trunk/doc/ja/html/about/history.html 2019-08-29 11:32:26 UTC (rev 8031) @@ -3182,6 +3182,7 @@ <ul> <li>SSH2: \x83|\x81[\x83g\x93]\x91\x97\x82\xC5SSH\x92ʐM\x82\xAA\x92x\x82\xA2\x8Fꍇ\x82ɂ\xA8\x82\xA2\x82āA\x8F\xC1\x94\x83\x82\x83\x8A\x82\xAA\x94\xEC\x91剻\x82\xB5\x82ăA\x83v\x83\x8A\x82\xAA\x97\x8E\x82\xBF\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li> <li>SSH2: SCP \x93]\x91\x97\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\xB6\x82\xE9\x82Ƃ\xAB\x82ɁA\x83t\x83@\x83C\x83\x8B\x93]\x91\x97\x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x90ݒ\xE8\x81ESCP\x91\x97\x90M\x90\xE6\x83p\x83X\x90ݒ肪\x8DX\x90V\x82\xB3\x82\xEA\x82Ȃ\xA2\x82\xB1\x82Ƃ\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li> + <li>SSH2: Windows95/98/Me\x82\xC5SCP\x92ʐM\x82\xF0\x8AJ\x8En\x82\xB7\x82\xE9\x82ƁA\x83A\x83v\x83\x8A\x82\xAA\x97\x8E\x82\xBF\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li> <li>SSH1: \x90ڑ\xB1\x90\xE6\x82̃|\x81[\x83g\x94ԍ\x86\x82\xAA22\x88ȊO\x82ŁA\x90V\x8BK\x82\xC9known_hosts\x83t\x83@\x83C\x83\x8B\x82փz\x83X\x83g\x8C\xAE\x82\xF0\x8F\x91\x82\xAB\x8D\x9E\x82ގ\x9E\x81A\x83A\x83v\x83\x8A\x82\xAA\x97\x8E\x82\xBF\x82邱\x82Ƃ\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li> <li>SSH1: rhosts\x94F\x8F\xAA\x82ł\xAB\x82Ȃ\xAD\x82Ȃ\xC1\x82Ă\xA2\x82\xBD\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li> </ul> Modified: trunk/ttssh2/ttxssh/ssh.c =================================================================== --- trunk/ttssh2/ttxssh/ssh.c 2019-08-28 15:34:58 UTC (rev 8030) +++ trunk/ttssh2/ttxssh/ssh.c 2019-08-29 11:32:26 UTC (rev 8031) @@ -351,7 +351,10 @@ c->scp.thread = INVALID_HANDLE_VALUE; } - ssh2_scp_free_packetlist(c); + // SCP\x8E\xF3\x90M\x82̏ꍇ\x82̂݁ASCP\x97p\x83\x8A\x83X\x83g\x82̊J\x95\xFA\x82\xF0\x8Ds\x82\xA4\x81B + // Windows9x\x82ŗ\x8E\x82\xBF\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B + if (c->scp.dir == FROMREMOTE) + ssh2_scp_free_packetlist(c); } if (c->type == TYPE_AGENT) { buffer_free(c->agent_msg);