From b60912569f37a38de4c1059bc2fa271f8c150868 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@blockstream.io>
Date: Sun, 8 Jul 2018 11:27:18 +0200
Subject: [PATCH] back-port resume data validation fixes

---
 src/torrent.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/torrent.cpp b/src/torrent.cpp
index e5a6d72ef..85343df3b 100644
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -7224,7 +7224,7 @@ namespace {
 		if (m_torrent_file->is_merkle_torrent())
 		{
 			bdecode_node mt = rd.dict_find_string("merkle tree");
-			if (mt)
+			if (mt && mt.string_length() >= 20)
 			{
 				std::vector<sha1_hash> tree;
 				tree.resize(m_torrent_file->merkle_tree().size());