valitydev/thrift
14
0
Fork 0
mirror of https://github.com/valitydev/thrift.git synced 2024-11-07 02:45:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

THRIFT-3650 incorrect union serialization

Browse Source 
Client: Compiler (general)
Patch: Jens Geyer

This closes #881
This commit is contained in:
Jens Geyer 2016-02-21 15:07:51 +01:00
parent 37a122271f
commit b72bb94a82
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/cpp/src/parse/t_struct.h
View File

@ -66,12 +66,16 @@ public:
void validate_union_member(t_field* field) {
if (is_union_ && (!name_.empty())) {
// unions can't have required fields
if (field->get_req() == t_field::T_REQUIRED) {
pwarning(1,
"Required field %s of union %s set to optional.\n",
field->get_name().c_str(),
name_.c_str());
// 1) unions can't have required fields
// 2) union members are implicitly optional, otherwise bugs like THRIFT-3650 wait to happen
if (field->get_req() != t_field::T_OPTIONAL) {
// no warning on default requiredness, but do warn on anything else that is explicitly asked for
if(field->get_req() != t_field::T_OPT_IN_REQ_OUT) {
pwarning(1,
"Union %s field %s: union members must be optional, ignoring specified requiredness.\n",
name_.c_str(),
field->get_name().c_str());
}
field->set_req(t_field::T_OPTIONAL);
}