| commit | 4936abe813d05b6cc78db408155d09ca9ad201de | [log] [tgz] |
|---|---|---|
| author | Joshua Haberman <jhaberman@gmail.com> | Thu Oct 15 10:29:09 2020 -0700 |
| committer | Joshua Haberman <jhaberman@gmail.com> | Thu Oct 15 10:29:09 2020 -0700 |
| tree | a71b5cfb4daa578f1c738339007c9ed60b7e427b | |
| parent | d140b1cdce9d00abd8a0c36b0d6e3e25c019d606 [diff] |
Fixed bug with oneofs in JSON decoding.
diff --git a/php/ext/google/protobuf/php-upb.c b/php/ext/google/protobuf/php-upb.c index e7ec7d9..8a6ffb8 100644 --- a/php/ext/google/protobuf/php-upb.c +++ b/php/ext/google/protobuf/php-upb.c
@@ -6794,7 +6794,7 @@ return; } - if (upb_fielddef_containingoneof(f) && + if (upb_fielddef_realcontainingoneof(f) && upb_msg_whichoneof(msg, upb_fielddef_containingoneof(f))) { jsondec_err(d, "More than one field for this oneof."); }