ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' into develop

Browse Source 
Conflicts:
	Builds/VisualStudio2013/RippleD.vcxproj
	Builds/VisualStudio2013/RippleD.vcxproj.filters
	Builds/rpm/rippled.spec
	src/ripple/app/misc/NetworkOPs.cpp
	src/ripple/app/tx/impl/TransactionEngine.cpp
	src/ripple/protocol/impl/BuildInfo.cpp
	src/ripple/unity/app_tx.cpp
This commit is contained in:
Vinnie Falco
2015-07-07 09:35:41 -07:00
parent fed3f7b74b 6374aad9bc
commit 097a8ce640
14 changed files with 113 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ripple/shamap/impl/SHAMapSync.cpp
View File

@@ -419,7 +419,7 @@ SHAMapAddNode SHAMap::addRootNode (Blob const& rootNode,
assert (seq_ >= 1);
auto node = SHAMapAbstractNode::make(rootNode, 0, format, uZero, false);
if (!node)
if (!node || !node->isValid ())
return SHAMapAddNode::invalid ();
#ifdef BEAST_DEBUG
@@ -459,7 +459,7 @@ SHAMapAddNode SHAMap::addRootNode (uint256 const& hash, Blob const& rootNode, SH
assert (seq_ >= 1);
auto node = SHAMapAbstractNode::make(rootNode, 0, format, uZero, false);
if (!node || node->getNodeHash () != hash)
if (!node || !node->isValid() || node->getNodeHash () != hash)
return SHAMapAddNode::invalid ();
if (backed_)
@@ -537,6 +537,13 @@ SHAMap::addKnownNode (const SHAMapNodeID& node, Blob const& rawNode,
auto newNode = SHAMapAbstractNode::make(rawNode, 0, snfWIRE, uZero, false);
if (!newNode || !newNode->isValid() || childHash != newNode->getNodeHash ())
{
if (journal_.warning) journal_.warning <<
"Corrupt node received";
return SHAMapAddNode::invalid ();
}
if (!newNode->isInBounds (iNodeID))
{
// Map is provably invalid
@@ -544,13 +551,6 @@ SHAMap::addKnownNode (const SHAMapNodeID& node, Blob const& rawNode,
return SHAMapAddNode::useful ();
}
if (childHash != newNode->getNodeHash ())
{
if (journal_.warning) journal_.warning <<
"Corrupt node received";
return SHAMapAddNode::invalid ();
}
if (backed_)
canonicalize (childHash, newNode);