svnno****@sourc*****
svnno****@sourc*****
2012年 11月 7日 (水) 20:16:31 JST
Tera TermRevision: 5062
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5062
Author: yutakapon
Date: 2012-11-07 20:16:30 +0900 (Wed, 07 Nov 2012)
Log Message:
-----------
チケット#30025: X11転送が開始できない
X11転送の開始が接続エラーで失敗することがある問題を修正した。
Ticket Links:
------------
http://sourceforge.jp/projects/ttssh2/tracker/detail/30025
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.c
trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.h
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2012-11-06 15:32:14 UTC (rev 5061)
+++ trunk/doc/en/html/about/history.html 2012-11-07 11:16:30 UTC (rev 5062)
@@ -1965,6 +1965,7 @@
<li>SCP sending will be failed for SSH server which the window size is small(Dropbear).</li>
<li>The SSH data will be corrupted by SSH2 delay re-transmit bug.</li>
<li>When the Java Web Start is used with X11 forwaring, Tera Term and Xming will stall.</li>
+ <li>When the X11 forwarding starts, the connection error will be occuured.</li>
</ul>
</li>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2012-11-06 15:32:14 UTC (rev 5061)
+++ trunk/doc/ja/html/about/history.html 2012-11-07 11:16:30 UTC (rev 5062)
@@ -1966,6 +1966,7 @@
<li>\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xAA\x8F\xAC\x82\xB3\x82\xA2SSH\x83T\x81[\x83o(\x97\xE1:Dropbear)\x82ɑ\xB5\x82\xC4SCP\x91\x97\x90M\x82\xAA\x8E\xB8\x94s\x82\xB7\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
<li>SSH2\x92x\x89\x84\x91\x97\x90M\x82̕s\x8B\x82ŁASSH\x83f\x81[\x83^\x82\xAA\x89\xF3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
<li>X11\x93]\x91\x97\x82\xC5Java Web Start\x82\xF0\x8Eg\x82\xA4\x82ƁATera Term\x82\xC6Xming\x82\xAA\x83X\x83g\x81[\x83\x8B\x82\xB7\x82錻\x8Fۂւ̏\x88\x92u\x82\xF0\x8Ds\x82\xC1\x82\xBD\x81B</li>
+ <li>X11\x93]\x91\x97\x82̊J\x8En\x82\xAA\x90ڑ\xB1\x83G\x83\x89\x81[\x82Ŏ\xB8\x94s\x82\xB7\x82邱\x82Ƃ\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
</ul>
</li>
Modified: trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.c
===================================================================
--- trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.c 2012-11-06 15:32:14 UTC (rev 5061)
+++ trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.c 2012-11-07 11:16:30 UTC (rev 5062)
@@ -31,14 +31,17 @@
/* packing arguments struct addrinfo_args */
ga->hWnd = hWnd;
ga->wMsg = wMsg;
- ga->hostname = hostname;
- ga->portname = portname;
+ ga->hostname = _strdup(hostname); // \x83|\x83C\x83\x93\x83^\x82\xBE\x82\xAF\x93n\x82\xB7\x82ƁA\x83X\x83\x8C\x83b\x83h\x90\xE6\x82ŕs\x92\xE8\x82ƂȂ\xE9\x81B(2012.11.7 yutaka)
+ ga->portname = _strdup(portname);
ga->hints = hints;
ga->res = res;
ga->lpHandle = (HANDLE FAR *)malloc(sizeof(HANDLE));
- if (ga->lpHandle == NULL)
+ if (ga->lpHandle == NULL) {
+ free(ga->hostname);
+ free(ga->portname);
return NULL;
+ }
/* create sub-thread running getaddrinfo() */
thread = (HANDLE)_beginthreadex(NULL, 0, getaddrinfo_thread, ga, CREATE_SUSPENDED, &tid);
@@ -48,6 +51,8 @@
/* return thread handle */
if (thread == 0) {
free(ga->lpHandle);
+ free(ga->hostname);
+ free(ga->portname);
free(ga);
return NULL;
} else
@@ -82,6 +87,8 @@
PostMessage(hWnd, wMsg, (WPARAM)*ga->lpHandle, MAKELPARAM(0, gai));
free(ga->lpHandle);
+ free(ga->hostname);
+ free(ga->portname);
free(p);
return 0;
Modified: trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.h
===================================================================
--- trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.h 2012-11-06 15:32:14 UTC (rev 5061)
+++ trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.h 2012-11-07 11:16:30 UTC (rev 5062)
@@ -12,8 +12,8 @@
struct getaddrinfo_args {
HWND hWnd;
unsigned int wMsg;
- const char FAR * hostname;
- const char FAR * portname;
+ char FAR * hostname;
+ char FAR * portname;
struct addrinfo FAR * hints;
struct addrinfo FAR * FAR * res;
HANDLE FAR * lpHandle;