cerc-io/solidity
10
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

Do not emit non-utf8 strings for ast json.

Browse Source
This commit is contained in:
chriseth 2016-09-02 00:21:39 +02:00
parent b5d941d3d9
commit ada31fa9b7
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libsolidity/ast/ASTJsonConverter.cpp
View File

@ -22,6 +22,7 @@
#include <libsolidity/ast/ASTJsonConverter.h> #include <libsolidity/ast/ASTJsonConverter.h>
#include <boost/algorithm/string/join.hpp> #include <boost/algorithm/string/join.hpp>
#include <libdevcore/UTF8.h>
#include <libsolidity/ast/AST.h> #include <libsolidity/ast/AST.h>
using namespace std; using namespace std;
@ -397,9 +398,21 @@ bool ASTJsonConverter::visit(ElementaryTypeNameExpression const& _node)
bool ASTJsonConverter::visit(Literal const& _node) bool ASTJsonConverter::visit(Literal const& _node)
{ {
char const* tokenString = Token::toString(_node.token()); char const* tokenString = Token::toString(_node.token());
size_t invalidPos = 0;
Json::Value value{_node.value()};
if (!dev::validate(_node.value(), invalidPos))
value = Json::nullValue;
Token::Value subdenomination = Token::Value(_node.subDenomination());
addJsonNode(_node, "Literal", { addJsonNode(_node, "Literal", {
make_pair("string", tokenString ? tokenString : Json::Value()), make_pair("token", tokenString ? tokenString : Json::Value()),
make_pair("value", _node.value()), make_pair("value", value),
make_pair("hexvalue", toHex(_node.value())),
make_pair(
"subdenomination",
subdenomination == Token::Illegal ?
Json::nullValue :
Json::Value{Token::toString(subdenomination)}
),
make_pair("type", type(_node)) make_pair("type", type(_node))
}); });
return true; return true;