[ttssh2-commit] [10295] バッファの先頭で結合文字が送られてくるとクラッシュする問題を修正

Back to archive index
scmno****@osdn***** scmno****@osdn*****
2022年 10月 4日 (火) 22:55:02 JST


Revision: 10295
          https://osdn.net/projects/ttssh2/scm/svn/commits/10295
Author:   zmatsuo
Date:     2022-10-04 22:55:02 +0900 (Tue, 04 Oct 2022)
Log Message:
-----------
バッファの先頭で結合文字が送られてくるとクラッシュする問題を修正

ticket #45763

Ticket Links:
------------
    https://osdn.net/projects/ttssh2/tracker/detail/45763

Modified Paths:
--------------
    trunk/teraterm/teraterm/buffer.c

-------------- next part --------------
Modified: trunk/teraterm/teraterm/buffer.c
===================================================================
--- trunk/teraterm/teraterm/buffer.c	2022-10-01 16:37:13 UTC (rev 10294)
+++ trunk/teraterm/teraterm/buffer.c	2022-10-04 13:55:02 UTC (rev 10295)
@@ -2861,7 +2861,13 @@
 						// 1\x82‘O\x82̕\xB6\x8E\x9A\x82\xAA1\x83Z\x83\x8B
 						StrChangeCount = 1;
 					}
-					StrChangeStart = CursorX - StrChangeCount;
+					if (CursorX == 0) {
+						// \x83J\x81[\x83\\x83\x8B\x82\xAA\x8D\xB6\x92[\x82̎\x9E
+						StrChangeStart = 0;
+					}
+					else {
+						StrChangeStart = CursorX - StrChangeCount;
+					}
 				}
 			}
 		}
@@ -3438,6 +3444,7 @@
 {
 	int X, Y;
 
+	assert(StrChangeStart >= 0);
 	if (StrChangeCount==0) {
 		return;
 	}


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