diff options
-rw-r--r-- | upb/decode.c | 5 | ||||
-rw-r--r-- | upb/encode.c | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/upb/decode.c b/upb/decode.c index a4da9a9..4340a90 100644 --- a/upb/decode.c +++ b/upb/decode.c @@ -269,7 +269,8 @@ static bool upb_decode_submsg(upb_decstate *d, const char *limit, const upb_msglayout_fieldinit_v1 *field, int group_number) { - char *submsg = *(void**)&frame->msg[field->offset]; + char *submsg_slot = upb_decode_prepareslot(d, frame, field); + char *submsg = *(void**)submsg_slot; const upb_msglayout_msginit_v1 *subm; UPB_ASSERT(field->submsg_index != UPB_NO_SUBMSG); @@ -281,7 +282,7 @@ static bool upb_decode_submsg(upb_decstate *d, CHK(submsg); submsg = upb_msg_init( submsg, (upb_msglayout*)subm, upb_arena_alloc(upb_env_arena(d->env))); - *(void**)&frame->msg[field->offset] = submsg; + *(void**)submsg_slot = submsg; } upb_decode_message(d, limit, group_number, submsg, subm); diff --git a/upb/encode.c b/upb/encode.c index f01ad0c..67678fe 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) { + 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)); + } } } } |