cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Return UTF-8 error in BoolResult and remove it from string type

Browse Source
This commit is contained in:
Alex Beregszaszi
2020-09-23 17:35:05 +01:00
parent a154594de6
commit e54110ff17
9 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/ast/Types.cpp
+11 -9
View File
@@ -1357,11 +1357,19 @@ BoolResult StringLiteralType::isImplicitlyConvertibleTo(Type const& _convertTo)
return true;
}
else if (auto arrayType = dynamic_cast<ArrayType const*>(&_convertTo))
{
size_t invalidSequence;
if (arrayType->isString() && !util::validateUTF8(value(), invalidSequence))
return BoolResult::err(
"Contains invalid UTF-8 sequence at position " +
util::toString(invalidSequence) +
"."
);
return
arrayType->location() != DataLocation::CallData &&
arrayType->isByteArray() &&
!(arrayType->dataStoredIn(DataLocation::Storage) && arrayType->isPointer()) &&
!(arrayType->isString() && !util::validateUTF8(value()));
!(arrayType->dataStoredIn(DataLocation::Storage) && arrayType->isPointer());
}
else
return false;
}
@@ -1392,15 +1400,9 @@ std::string StringLiteralType::toString(bool) const
return true;
};
string ret = isPrintableASCII(m_value) ?
return isPrintableASCII(m_value) ?
("literal_string \"" + m_value + "\"") :
("literal_string hex\"" + util::toHex(util::asBytes(m_value)) + "\"");
size_t invalidSequence;
if (!util::validateUTF8(m_value, invalidSequence))
ret += " (contains invalid UTF-8 sequence at position " + util::toString(invalidSequence) + ")";
return ret;
}
TypePointer StringLiteralType::mobileType() const