diff options
| author | Paul Yang <TeBoring@users.noreply.github.com> | 2018-03-07 14:31:25 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-07 14:31:25 -0800 |
| commit | 681cf4279c152e60e67989b83134018c7058f874 (patch) | |
| tree | 1c5176ef5236b74a099ee60b3a9dc40ef982533a /upb/encode.c | |
| parent | 6edcf6a82a1d49d784302c152735e4bdba6d643e (diff) | |
| parent | dfe7d3a3749ff1cdb55d839e3dbfda46b8b2ee72 (diff) | |
Merge pull request #100 from TeBoring/php-change
Fix oneof encoding/decoding
Diffstat (limited to 'upb/encode.c')
| -rw-r--r-- | upb/encode.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/upb/encode.c b/upb/encode.c index f01ad0c..abcf17c 100644 --- a/upb/encode.c +++ b/upb/encode.c @@ -360,7 +360,13 @@ bool upb_encode_message(upb_encstate* e, const char *msg, CHK(upb_encode_array(e, msg + f->offset, m, f)); } else { if (upb_encode_hasscalarfield(msg, m, f)) { - CHK(upb_encode_scalarfield(e, msg + f->offset, m, f, !m->is_proto2)); + if (f->oneof_index == UPB_NOT_IN_ONEOF) { + CHK(upb_encode_scalarfield(e, msg + f->offset, m, f, !m->is_proto2)); + } else { + const upb_msglayout_oneofinit_v1 *o = &m->oneofs[f->oneof_index]; + CHK(upb_encode_scalarfield(e, msg + o->data_offset, + m, f, !m->is_proto2)); + } } } } |