Skip to content
Permalink
Browse files

Merge pull request #7836 from ethereum/formatCheckAssertion

Change string formatting check to assertion.
  • Loading branch information
chriseth committed Nov 28, 2019
2 parents 912a0e2 + 4608619 commit 5855428ec0b414444a080a85af1055b4c2dd6345
Showing with 8 additions and 7 deletions.
  1. +6 −7 libdevcore/CommonData.cpp
  2. +1 −0 libdevcore/CommonData.h
  3. +1 −0 libdevcore/Exceptions.h
@@ -179,14 +179,13 @@ bool dev::isValidDecimal(string const& _string)
return true;
}

// Returns a quoted string if all characters are printable ASCII chars,
// or its hex representation otherwise.
std::string dev::formatAsStringOrNumber(std::string const& _value)
string dev::formatAsStringOrNumber(string const& _value)
{
if (_value.length() <= 32)
for (auto const& c: _value)
if (c <= 0x1f || c >= 0x7f || c == '"')
return "0x" + h256(_value, h256::AlignLeft).hex();
assertThrow(_value.length() <= 32, StringTooLong, "String to be formatted longer than 32 bytes.");

for (auto const& c: _value)
if (c <= 0x1f || c >= 0x7f || c == '"')
return "0x" + h256(_value, h256::AlignLeft).hex();

return "\"" + _value + "\"";
}
@@ -356,6 +356,7 @@ bool isValidDecimal(std::string const& _string);

/// @returns a quoted string if all characters are printable ASCII chars,
/// or its hex representation otherwise.
/// _value cannot be longer than 32 bytes.
std::string formatAsStringOrNumber(std::string const& _value);

template<typename Container, typename Compare>
@@ -49,6 +49,7 @@ DEV_SIMPLE_EXCEPTION(BadHexCharacter);
DEV_SIMPLE_EXCEPTION(BadHexCase);
DEV_SIMPLE_EXCEPTION(FileError);
DEV_SIMPLE_EXCEPTION(DataTooLong);
DEV_SIMPLE_EXCEPTION(StringTooLong);

// error information to be added to exceptions
using errinfo_comment = boost::error_info<struct tag_comment, std::string>;

0 comments on commit 5855428

Please sign in to comment.
You can’t perform that action at this time.