From 9a331a965475286f81589593d7e3b28bb04efff1 Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Sat, 1 Jun 2013 15:59:56 +0200
Subject: [PATCH] TortoiseGitMerge: Fixed possible crash while applying a patch

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 src/TortoiseMerge/Patch.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/TortoiseMerge/Patch.cpp b/src/TortoiseMerge/Patch.cpp
index ebba2df39..d11bf0185 100644
--- a/src/TortoiseMerge/Patch.cpp
+++ b/src/TortoiseMerge/Patch.cpp
@@ -568,6 +568,8 @@ int CPatch::PatchFile(const int strip, int nIndex, const CString& sPatchPath, co
 					}
 					else
 					{
+						if (k >= chunk->arLines.GetCount())
+							k = j;
 						m_sErrorMessage.Format(IDS_ERR_PATCH_DOESNOTMATCH, (LPCTSTR)PatchLines.GetAt(lAddLine - 1), chunk->arLines.GetAt(k));
 						return FALSE;
 					}
-- 
2.11.4.GIT