From 520b78e47a75e2e87b3b56e653b8ab78a351dbfa Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <philipp@crocoll.net>
Date: Mon, 10 Jul 2017 12:39:48 +0200
Subject: [PATCH] fix potenital crash with invalid template entry

---
 src/keepass2android/KpEntryTemplatedEdit.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/keepass2android/KpEntryTemplatedEdit.cs b/src/keepass2android/KpEntryTemplatedEdit.cs
index a03a5149..2979f5cb 100644
--- a/src/keepass2android/KpEntryTemplatedEdit.cs
+++ b/src/keepass2android/KpEntryTemplatedEdit.cs
@@ -48,11 +48,14 @@ namespace keepass2android
 		{
 			if (entry.Strings.Exists(EtmTemplateUuid))
 			{
-				PwUuid templateUuid = new PwUuid(MemUtil.HexStringToByteArray(entry.Strings.ReadSafe(EtmTemplateUuid)));
-				return db.Entries.ContainsKey(templateUuid);
+				byte[] uuidBytes = MemUtil.HexStringToByteArray(entry.Strings.ReadSafe(EtmTemplateUuid));
+				if (uuidBytes != null)
+				{
+						PwUuid templateUuid = new PwUuid(uuidBytes);
+						return db.Entries.ContainsKey(templateUuid);
+				}
 			}
-			else
-				return false;
+			return false;
 		}
 
 		public KpEntryTemplatedEdit(Database db, PwEntry entry)