diff options
author | Bo Yang <teboring@google.com> | 2018-03-07 21:07:14 +0000 |
---|---|---|
committer | Bo Yang <teboring@google.com> | 2018-03-07 21:07:14 +0000 |
commit | ba93474aa223bdaf7cb524c002824096a4837146 (patch) | |
tree | 007b2b9fcff24359f6db9f3983baaeca214c5bbf /upb/decode.c | |
parent | 6edcf6a82a1d49d784302c152735e4bdba6d643e (diff) |
Fix oneof encoding/decoding
Diffstat (limited to 'upb/decode.c')
-rw-r--r-- | upb/decode.c | 5 |
1 files changed, 3 insertions, 2 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); |