Merge pull request #1947 from suconbu/feature/fix_crash_in_boxselection

最終行を矩形選択して削除すると落ちる問題を修正
sakura-editor · Apr 29, 2024 · 5def577 · 5def577
2 parents be036ee + cc6fffd
commit 5def577
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/sakura_core/view/CEditView_Command_New.cpp b/sakura_core/view/CEditView_Command_New.cpp
@@ -557,7 +557,7 @@ void CEditView::DeleteData(
 
 			CLayoutPoint caretOld = CLayoutPoint(rcSel.left, rcSel.top);
 			m_pcEditDoc->m_cLayoutMgr.GetLineStr( rcSel.top, &nLineLen, &pcLayout );
-			if( rcSel.left <= pcLayout->CalcLayoutWidth( m_pcEditDoc->m_cLayoutMgr ) ){
+			if( pcLayout != NULL && rcSel.left <= pcLayout->CalcLayoutWidth( m_pcEditDoc->m_cLayoutMgr ) ){
 				// EOLより左なら文字の単位にそろえる
 				CLogicInt nIdxCaret = LineColumnToIndex( pcLayout, rcSel.left );
 				caretOld.SetX( LineIndexToColumn( pcLayout, nIdxCaret ) );