[Winmerge-svn] SF.net SVN: winmerge: [3654] trunk/Src
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <sdo...@us...> - 2006-09-27 15:32:10
|
Revision: 3654 http://svn.sourceforge.net/winmerge/?rev=3654&view=rev Author: sdottaka Date: 2006-09-27 08:31:58 -0700 (Wed, 27 Sep 2006) Log Message: ----------- BUG: [ 1564572 ] Leak memory on undoing Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/GhostTextBuffer.h trunk/Src/editlib/ccrystaltextbuffer.h Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-27 15:30:19 UTC (rev 3653) +++ trunk/Src/Changes.txt 2006-09-27 15:31:58 UTC (rev 3654) @@ -2,6 +2,11 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-09-27 Takashi + BUG: [ 1564572 ] Leak memory on undoing + Src: GhostTextBuffer.h + Src/editlib: ccrystaltextbuffer.h + 2006-09-27 Kimmo PATCH: [ 1565917 ] Register.bat to register ShellExt for 64-bit Windows ShellExtension: Register.bat Modified: trunk/Src/GhostTextBuffer.h =================================================================== --- trunk/Src/GhostTextBuffer.h 2006-09-27 15:30:19 UTC (rev 3653) +++ trunk/Src/GhostTextBuffer.h 2006-09-27 15:31:58 UTC (rev 3654) @@ -157,7 +157,8 @@ m_nRealLinesInDeletedBlock = src.m_nRealLinesInDeletedBlock; SetText(src.GetText()); INT_PTR size = src.m_paSavedRevisonNumbers->GetSize(); - m_paSavedRevisonNumbers = new CDWordArray(); + if (!m_paSavedRevisonNumbers) + m_paSavedRevisonNumbers = new CDWordArray(); m_paSavedRevisonNumbers->SetSize(size); INT_PTR i; for (i = 0; i < size; i++) Modified: trunk/Src/editlib/ccrystaltextbuffer.h =================================================================== --- trunk/Src/editlib/ccrystaltextbuffer.h 2006-09-27 15:30:19 UTC (rev 3653) +++ trunk/Src/editlib/ccrystaltextbuffer.h 2006-09-27 15:31:58 UTC (rev 3654) @@ -192,7 +192,8 @@ m_nAction = src.m_nAction; SetText(src.GetText()); INT_PTR size = src.m_paSavedRevisonNumbers->GetSize(); - m_paSavedRevisonNumbers = new CDWordArray(); + if (!m_paSavedRevisonNumbers) + m_paSavedRevisonNumbers = new CDWordArray(); m_paSavedRevisonNumbers->SetSize(size); INT_PTR i; for (i = 0; i < size; i++) @@ -203,7 +204,7 @@ { FreeText(); if (m_paSavedRevisonNumbers) - delete m_paSavedRevisonNumbers; + delete m_paSavedRevisonNumbers; } void SetText (LPCTSTR pszText); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |