From 6b37a448c46dd82381c0c7c49123c4c42432f915 Mon Sep 17 00:00:00 2001
From: Sup Yut Sum <ch3cooli@gmail.com>
Date: Sun, 7 Apr 2013 19:18:26 +0800
Subject: [PATCH] TortoiseGitMerge: Fix crash when reviewing a patch with
 invalid version info

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
---
 src/TortoiseMerge/Patch.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TortoiseMerge/Patch.cpp b/src/TortoiseMerge/Patch.cpp
index 246c1d14e..ebba2df39 100644
--- a/src/TortoiseMerge/Patch.cpp
+++ b/src/TortoiseMerge/Patch.cpp
@@ -106,7 +106,7 @@ BOOL CPatch::ParsePatchFile(CFileTextLines &PatchLines)
 				if( sLine.Find(_T("index"))==0 )
 				{
 					int dotstart=sLine.Find(_T(".."));
-					if(dotstart>=0)
+					if(dotstart>=0 && chunks)
 					{
 						chunks->sRevision = sLine.Mid(dotstart-7,7);
 						chunks->sRevision2 = sLine.Mid(dotstart+2,7);
-- 
2.11.4.GIT