diff options
Diffstat (limited to 'upb')
| -rw-r--r-- | upb/encode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/upb/encode.c b/upb/encode.c index 67678fe..abcf17c 100644 --- a/upb/encode.c +++ b/upb/encode.c @@ -360,12 +360,12 @@ 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)) { - if (f->oneof_index != UPB_NOT_IN_ONEOF) { + 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)); - } else { - CHK(upb_encode_scalarfield(e, msg + f->offset, m, f, !m->is_proto2)); } } } |