Merge pull request #1235 from berryzplus/feature/amend_pr1034_copy_of…

…_wstring wstringをWCHAR[N]にコピーする処理でNUL終端が付かない不具合を修正
sakura-editor · Apr 23, 2020 · 82e4761 · 82e4761
2 parents 948ce7e + edf5daf
commit 82e4761
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/sakura_core/typeprop/CImpExpManager.cpp b/sakura_core/typeprop/CImpExpManager.cpp
@@ -630,7 +630,7 @@ bool CImpExpRegex::Import( const wstring& sFileName, wstring& sErrMsg )
 	{
 		//1行読み込み
 		wstring line=in.ReadLineW();
-		line.copy( buff, line.length(), 0 );
+		line.copy( buff, line.length() + 1, 0 );
 
 		if(count >= MAX_REGEX_KEYWORD){
 			sErrMsg = LS(STR_IMPEXP_REGEX1);

diff --git a/sakura_core/typeprop/CPropTypesKeyHelp.cpp b/sakura_core/typeprop/CPropTypesKeyHelp.cpp
@@ -235,7 +235,7 @@ INT_PTR CPropTypesKeyHelp::DispatchEvent(
 					}
 					// 開けたなら1行目を取得してから閉じる -> szAbout
 					std::wstring line=in.ReadLineW();
-					line.copy( szAbout, line.length(), 0 );
+					line.copy( szAbout, line.length() + 1, 0 );
 					in.Close();
 				}
 				strcnv(szAbout);