ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return descriptive error message from memo validation (RIPD-591).

Browse Source
This commit is contained in:
Nik Bougalis
2014-10-03 19:17:42 -07:00
committed by Tom Ritchford
parent da8ceed07e
commit 9e1a6589d4
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/ripple/app/misc/SerializedTransaction.cpp
View File

@@ -276,42 +276,47 @@ SerializedTransaction::getMetaSQL (Serializer rawTxn,
//------------------------------------------------------------------------------
bool isMemoOkay (STObject const& st)
static
bool
isMemoOkay (STObject const& st, std::string& reason)
{
if (!st.isFieldPresent (sfMemos))
return true;
const STArray& memos = st.getFieldArray (sfMemos);
// The number 2048 is a preallocation hint, not a hard limit
// to avoid allocate/copy/free's
Serializer s (2048);
memos.add (s);
// FIXME move the memo limit into a config tunable
if (s.getDataLength () > 1024)
{
reason = "The memo exceeds the maximum allowed size.";
return false;
}
for (auto const& memo : memos)
{
auto memoObj = dynamic_cast <STObject const*> (&memo);
// Memos array must consist solely of Memo objects
if (!memoObj || (memoObj->getFName() != sfMemo))
{
reason = "A memo array may contain only Memo objects.";
return false;
}
// Memo objects may only contain
// MemoType, MemoData, and MemoFormat fields
for (auto const& memoElement : *memoObj)
{
if ((memoElement.getFName() != sfMemoType) &&
(memoElement.getFName() != sfMemoData) &&
(memoElement.getFName() != sfMemoFormat))
{
reason = "A memo may contain only MemoType, MemoData or MemoFormat fields.";
return false;
}
}
}
return true;
@@ -334,11 +339,9 @@ isAccountFieldOkay (STObject const& st)
bool passesLocalChecks (STObject const& st, std::string& reason)
{
if (!isMemoOkay (st))
{
reason = "The memo exceeds the maximum allowed size.";
if (!isMemoOkay (st, reason))
return false;
}
if (!isAccountFieldOkay (st))
{
reason = "An account field is invalid.";