Skip to content

fix rapidJSON assertion failed #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cyshi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix rapidJSON assertion failed #245

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 28 additions & 16 deletions src/sofa/pbrpc/pbjson.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,9 @@ static int json2field(const rapidjson::Value* json, Message* msg, const FieldDes
{
case FieldDescriptor::CPPTYPE_INT32:
{
if (json->GetType() != rapidjson::kNumberType)
if (!json->IsInt())
{
RETURN_ERR(ERR_INVALID_JSON, "Not a number");
RETURN_ERR(ERR_INVALID_JSON, "Not an int32 number");
}
if (repeated)
{
Expand All @@ -299,9 +299,9 @@ static int json2field(const rapidjson::Value* json, Message* msg, const FieldDes
}
case FieldDescriptor::CPPTYPE_UINT32:
{
if (json->GetType() != rapidjson::kNumberType)
if (!json->IsUint())
{
RETURN_ERR(ERR_INVALID_JSON, "Not a number");
RETURN_ERR(ERR_INVALID_JSON, "Not an uint32 number");
}
if (repeated)
{
Expand All @@ -315,9 +315,9 @@ static int json2field(const rapidjson::Value* json, Message* msg, const FieldDes
}
case FieldDescriptor::CPPTYPE_INT64:
{
if (json->GetType() != rapidjson::kNumberType)
if (!json->IsInt64())
{
RETURN_ERR(ERR_INVALID_JSON, "Not a number");
RETURN_ERR(ERR_INVALID_JSON, "Not an int64 number");
}
if (repeated)
{
Expand All @@ -331,9 +331,9 @@ static int json2field(const rapidjson::Value* json, Message* msg, const FieldDes
}
case FieldDescriptor::CPPTYPE_UINT64:
{
if (json->GetType() != rapidjson::kNumberType)
if (!json->IsUint64())
{
RETURN_ERR(ERR_INVALID_JSON, "Not a number");
RETURN_ERR(ERR_INVALID_JSON, "Not an uint64 number");
}
if (repeated)
{
Expand All @@ -347,9 +347,9 @@ static int json2field(const rapidjson::Value* json, Message* msg, const FieldDes
}
case FieldDescriptor::CPPTYPE_DOUBLE:
{
if (json->GetType() != rapidjson::kNumberType)
if (!json->IsDouble())
{
RETURN_ERR(ERR_INVALID_JSON, "Not a number");
RETURN_ERR(ERR_INVALID_JSON, "Not a float number");
}
if (repeated)
{
Expand All @@ -363,9 +363,9 @@ static int json2field(const rapidjson::Value* json, Message* msg, const FieldDes
}
case FieldDescriptor::CPPTYPE_FLOAT:
{
if (json->GetType() != rapidjson::kNumberType)
if (!json->IsDouble())
{
RETURN_ERR(ERR_INVALID_JSON, "Not a number");
RETURN_ERR(ERR_INVALID_JSON, "Not a float number");
}
if (repeated)
{
Expand All @@ -379,7 +379,7 @@ static int json2field(const rapidjson::Value* json, Message* msg, const FieldDes
}
case FieldDescriptor::CPPTYPE_BOOL:
{
if (json->GetType() != rapidjson::kTrueType && json->GetType() != rapidjson::kFalseType)
if (!json->IsBool())
{
RETURN_ERR(ERR_INVALID_JSON, "Not a bool");
}
Expand All @@ -396,7 +396,7 @@ static int json2field(const rapidjson::Value* json, Message* msg, const FieldDes
}
case FieldDescriptor::CPPTYPE_STRING:
{
if (json->GetType() != rapidjson::kStringType)
if (!json->IsString())
{
RETURN_ERR(ERR_INVALID_JSON, "Not a string");
}
Expand Down Expand Up @@ -436,11 +436,23 @@ static int json2field(const rapidjson::Value* json, Message* msg, const FieldDes
{
const EnumDescriptor *ed = field->enum_type();
const EnumValueDescriptor *ev = 0;
if (json->GetType() == rapidjson::kNumberType)
if (json->IsInt())
{
ev = ed->FindValueByNumber(json->GetInt());
}
else if (json->GetType() == rapidjson::kStringType)
else if (json->IsUint())
{
ev = ed->FindValueByNumber(json->GetUint());
}
else if (json->IsInt64())
{
ev = ed->FindValueByNumber(json->GetInt64());
}
else if (json->IsUint64())
{
ev = ed->FindValueByNumber(json->GetUint64());
}
else if (json->IsString())
{
ev = ed->FindValueByName(json->GetString());
}
Expand Down