From cd8721fbdc47c2f2dbe92b1ca3fabfa27450b743 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Sat, 9 Mar 2013 11:13:18 -0800
Subject: [PATCH 1/2] Add an assert to catch a mismatch in id/hash size tables.

---
 src/cpp/ripple/LedgerAcquire.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/cpp/ripple/LedgerAcquire.cpp b/src/cpp/ripple/LedgerAcquire.cpp
index 025046b91..1cd2ef1c4 100644
--- a/src/cpp/ripple/LedgerAcquire.cpp
+++ b/src/cpp/ripple/LedgerAcquire.cpp
@@ -528,6 +528,8 @@ int PeerSet::getPeerCount() const
 void LedgerAcquire::filterNodes(std::vector<SHAMapNode>& nodeIDs, std::vector<uint256>& nodeHashes,
 	std::set<SHAMapNode>& recentNodes, int max, bool aggressive)
 { // ask for new nodes in preference to ones we've already asked for
+	assert(nodeIDs.size() == nodeHashes.size());
+
 	std::vector<bool> duplicates;
 	duplicates.reserve(nodeIDs.size());
 

From 366313a3e4d421806237762cfd69f92cf186c7a5 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Sat, 9 Mar 2013 11:13:34 -0800
Subject: [PATCH 2/2] Always add a hash when we add an ID.

---
 src/cpp/ripple/SHAMapSync.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/cpp/ripple/SHAMapSync.cpp b/src/cpp/ripple/SHAMapSync.cpp
index fb754e45f..2ccde27f2 100644
--- a/src/cpp/ripple/SHAMapSync.cpp
+++ b/src/cpp/ripple/SHAMapSync.cpp
@@ -73,6 +73,7 @@ void SHAMap::getMissingNodes(std::vector<SHAMapNode>& nodeIDs, std::vector<uint2
 				{ // we need this node
 					have_all = false;
 					nodeIDs.push_back(childID);
+					hashes.push_back(childHash);
 					if (--max <= 0)
 						return;
 				}