• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Révision28690 (tree)
l'heure2019-11-08 02:31:18
Auteurstefankueng

Message de Log

Prevent access to non-existing line data.

Change Summary

Modification

--- trunk/src/Changelog.txt (revision 28689)
+++ trunk/src/Changelog.txt (revision 28690)
@@ -1,4 +1,7 @@
1-Version 1.13.1
1+Version 1.13.2
2+- BUG: Crash in TMerge when indenting. (Stefan)
3+
4+Version 1.13.1
25 - BUG: binary files were not digitally signed
36 for the release. (Stefan)
47 - BUG: missing c-runtime dlls. (Stefan)
--- trunk/src/TortoiseMerge/BaseView.cpp (revision 28689)
+++ trunk/src/TortoiseMerge/BaseView.cpp (revision 28690)
@@ -6210,8 +6210,12 @@
62106210 bool below = j < GetViewCount() && j <= y + maxGuessLine;
62116211 if (!(above || below))
62126212 break;
6213- auto ac = GetViewLine(i);
6214- auto bc = GetViewLine(j);
6213+ auto ac = CString();
6214+ auto bc = CString();
6215+ if (above)
6216+ ac = GetViewLine(i);
6217+ if (below)
6218+ bc = GetViewLine(j);
62156219 if ((ac.Find('\t') >= 0) || (bc.Find('\t') >= 0))
62166220 {
62176221 nTabMode = 0;
Afficher sur ancien navigateur de dépôt.