| commit | 4cf85c8d29ec12c3f5d2bd43d6e3c4e8755a47a1 | [log] [tgz] |
|---|---|---|
| author | android-build-team Robot <android-build-team-robot@google.com> | Tue Mar 23 22:03:31 2021 +0000 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Tue Mar 23 22:03:31 2021 +0000 |
| tree | 1d450e07561b50e0c5b61a6c461ab09dd02ebf04 | |
| parent | b8cde20ed45777bf7b6159aa65fb819ccbfa5a5c [diff] | |
| parent | b866b6d10ac195e863e30c5bccfe3b4426435ca4 [diff] |
Snap for 7230386 from b866b6d10ac195e863e30c5bccfe3b4426435ca4 to rvc-d2-release Change-Id: Ibf8191af4788958b95cdd1476b3ffa7accae6e2c
diff --git a/src/google/protobuf/util/internal/protostream_objectsource.cc b/src/google/protobuf/util/internal/protostream_objectsource.cc index 252184d..f632064 100644 --- a/src/google/protobuf/util/internal/protostream_objectsource.cc +++ b/src/google/protobuf/util/internal/protostream_objectsource.cc
@@ -539,6 +539,11 @@ ow->StartObject(field_name); while (tag != 0) { field = os->FindAndVerifyField(type, tag); + if (field == nullptr) { + WireFormat::SkipField(os->stream_, tag, nullptr); + tag = os->stream_->ReadTag(); + continue; + } // google.protobuf.Struct has only one field that is a map. Hence we use // RenderMap to render that field. if (os->IsMap(*field)) {