Thread: [Winmerge-svn] SF.net SVN: winmerge:[6080] trunk/Src/FileFilterHelper.cpp
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2008-11-09 22:23:14
|
Revision: 6080 http://winmerge.svn.sourceforge.net/winmerge/?rev=6080&view=rev Author: kimmov Date: 2008-11-09 22:23:10 +0000 (Sun, 09 Nov 2008) Log Message: ----------- BUG: [ 2238083 ] Expression string literator not derefencable Modified Paths: -------------- trunk/Src/FileFilterHelper.cpp Modified: trunk/Src/FileFilterHelper.cpp =================================================================== --- trunk/Src/FileFilterHelper.cpp 2008-11-07 23:27:12 UTC (rev 6079) +++ trunk/Src/FileFilterHelper.cpp 2008-11-09 22:23:10 UTC (rev 6080) @@ -168,7 +168,7 @@ void FileFilterHelper::SetUserFilterPath(const String & filterPath) { m_sUserSelFilterPath = filterPath; - if (*filterPath.end() != '\\') + if (filterPath[filterPath.length() - 1] != '\\') m_sUserSelFilterPath += _T("\\"); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jt...@us...> - 2010-06-14 21:27:42
|
Revision: 7194 http://winmerge.svn.sourceforge.net/winmerge/?rev=7194&view=rev Author: jtuc Date: 2010-06-14 21:27:35 +0000 (Mon, 14 Jun 2010) Log Message: ----------- Fix regression from MFC to STL string conversion committed as of revision 6865. Revision Links: -------------- http://winmerge.svn.sourceforge.net/winmerge/?rev=6865&view=rev Modified Paths: -------------- trunk/Src/FileFilterHelper.cpp Modified: trunk/Src/FileFilterHelper.cpp =================================================================== --- trunk/Src/FileFilterHelper.cpp 2010-06-13 20:02:50 UTC (rev 7193) +++ trunk/Src/FileFilterHelper.cpp 2010-06-14 21:27:35 UTC (rev 7194) @@ -335,7 +335,7 @@ bFilterAdded = FALSE; pos = ext.find_first_of(pszSeps); - if (bFilterAdded && pos >= 0) + if (bFilterAdded && pos != String::npos) strPattern += _T("|"); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |