[Winmerge-svn] SF.net SVN: winmerge: [4028] branches/R2_6/Src

[<sdo...@us...>]

Revision: 4028
          http://svn.sourceforge.net/winmerge/?rev=4028&view=rev
Author:   sdottaka
Date:     2007-01-10 07:10:53 -0800 (Wed, 10 Jan 2007)

Log Message:
-----------
BUG: [ 1631613 ] WinMerge crashes when editing code files

Modified Paths:
--------------
    branches/R2_6/Src/Changes.txt
    branches/R2_6/Src/editlib/ccrystaleditview.cpp

Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt	2007-01-10 15:10:02 UTC (rev 4027)
+++ branches/R2_6/Src/Changes.txt	2007-01-10 15:10:53 UTC (rev 4028)
@@ -3,6 +3,10 @@
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
 2007-01-10 Takashi
+ BUG: [ 1631613 ] WinMerge crashes when editing code files
+  Src/editlib: ccrystaleditview.cpp
+
+2007-01-10 Takashi
  BUG: [ 1630630 ] Unexpected selection of text after changing pane
   Src: MergeEditView.cpp
 

Modified: branches/R2_6/Src/editlib/ccrystaleditview.cpp
===================================================================
--- branches/R2_6/Src/editlib/ccrystaleditview.cpp	2007-01-10 15:10:02 UTC (rev 4027)
+++ branches/R2_6/Src/editlib/ccrystaleditview.cpp	2007-01-10 15:10:53 UTC (rev 4028)
@@ -1641,7 +1641,7 @@
                     {
                       int nTabSize = GetTabSize ();
                       int nChars = nTabSize - nPos % nTabSize;
-                      pszInsertStr = (TCHAR *) _alloca (sizeof (TCHAR) * (nPos + nChars));
+                      pszInsertStr = (TCHAR *) _alloca (sizeof (TCHAR) * (nPos + nChars + 1));
                       _tcsncpy (pszInsertStr, pszLineChars, nPos);
                       while (nChars--)
                         {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.