TortoiseMerge GPF if passed two arguments instead of three

Version: Debug build of Revision 7329

Issue:
Passing two filenames instead of three to TMerge causes it to GPF. This
does not seem to happen with the release build.

This is caused by an attempt to use the non-existent third filename.

The following patch cures it.

Hope this is of some use,

Regards

Jeremy Whitby

Index: src/TortoiseMerge/TortoiseMerge.cpp
===================================================================
--- src/TortoiseMerge/TortoiseMerge.cpp (revision 7338)
+++ src/TortoiseMerge/TortoiseMerge.cpp (working copy)
@@ -296,7 +296,7 @@
                 {
                     pFrame->m_Data.m_baseFile.SetFileName(szArglist[1]);
                     pFrame->m_Data.m_yourFile.SetFileName(szArglist[2]);
- if ( PathFileExists(szArglist[3]) )
+ if ( nArgs == 4 && PathFileExists(szArglist[3]) )
                     {
                         
pFrame->m_Data.m_theirFile.SetFileName(szArglist[3]);
                     }

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sun Aug 27 21:02:45 2006