|
From: <ge...@us...> - 2010-11-21 17:42:33
|
Revision: 7439
http://winmerge.svn.sourceforge.net/winmerge/?rev=7439&view=rev
Author: gerundt
Date: 2010-11-21 17:42:27 +0000 (Sun, 21 Nov 2010)
Log Message:
-----------
PATCH: [ 3109521 ] Crash after deleting text
Submitted by Lars Wittenburg
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/MergeEditView.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-11-21 13:34:25 UTC (rev 7438)
+++ trunk/Docs/Users/ChangeLog.txt 2010-11-21 17:42:27 UTC (rev 7439)
@@ -11,6 +11,7 @@
Bugfix: No menu icons was shown on Windows x64 (#3070151)
Bugfix: Crash when pasting from clipboard (#3109525)
Bugfix: Keeps verifing path even turned off in options (#3111581)
+ Bugfix: Crash after deleting text (#3109521)
Translation updates:
- Bulgarian (#3082392)
Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp 2010-11-21 13:34:25 UTC (rev 7438)
+++ trunk/Src/MergeEditView.cpp 2010-11-21 17:42:27 UTC (rev 7439)
@@ -451,6 +451,9 @@
void CMergeEditView::GetLineColors2(int nLineIndex, DWORD ignoreFlags, COLORREF & crBkgnd,
COLORREF & crText, BOOL & bDrawWhitespace)
{
+ if (GetLineCount() <= nLineIndex)
+ return;
+
DWORD dwLineFlags = GetLineFlags(nLineIndex);
if (dwLineFlags & ignoreFlags)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
