diff options
| author |   Petteri Aimonen <jpa@git.mail.kapsi.fi> | 2015-01-11 19:46:15 +0200 |
|---|---|---|
| committer | Petteri Aimonen <jpa@git.mail.kapsi.fi> | 2015-01-11 19:46:15 +0200 |
| commit | d2e023e3e5ef888e176292f149d1ba93ba270c94 (patch) | |
| tree | 0670534d7f96dfaa1db888af656416b0969f72fc /pb_decode.c | |
| parent | 8d12fecc7e4fb6899eb0d013abe0d6a5e03447ce (diff) | |
Bugfixes for oneof support.
Fixes crashes / memory leaks when using pointer type fields.
Also fixes initialization of which_oneof fields.
Diffstat (limited to 'pb_decode.c')
| -rw-r--r-- | pb_decode.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/pb_decode.c b/pb_decode.c index 542fdc4c..0677594f 100644 --- a/pb_decode.c +++ b/pb_decode.c @@ -747,13 +747,15 @@ static void pb_field_set_to_default(pb_field_iter_t *iter) * itself also. */ *(bool*)iter->pSize = false; } - else if (PB_HTYPE(type) == PB_HTYPE_REPEATED) + else if (PB_HTYPE(type) == PB_HTYPE_REPEATED || + PB_HTYPE(type) == PB_HTYPE_ONEOF) { - /* Set array count to 0, no need to initialize contents. */ + /* REPEATED: Set array count to 0, no need to initialize contents. + ONEOF: Set which_field to 0. */ *(pb_size_t*)iter->pSize = 0; init_data = false; } - + if (init_data) { if (PB_LTYPE(iter->pos->type) == PB_LTYPE_SUBMESSAGE) @@ -779,7 +781,8 @@ static void pb_field_set_to_default(pb_field_iter_t *iter) *(void**)iter->pData = NULL; /* Initialize array count to 0. */ - if (PB_HTYPE(type) == PB_HTYPE_REPEATED) + if (PB_HTYPE(type) == PB_HTYPE_REPEATED || + PB_HTYPE(type) == PB_HTYPE_ONEOF) { *(pb_size_t*)iter->pSize = 0; } @@ -938,6 +941,12 @@ static void pb_release_single_field(const pb_field_iter_t *iter) pb_type_t type; type = iter->pos->type; + if (PB_HTYPE(type) == PB_HTYPE_ONEOF) + { + if (*(pb_size_t*)iter->pSize != iter->pos->tag) + return; /* This is not the current field in the union */ + } + /* Release anything contained inside an extension or submsg. * This has to be done even if the submsg itself is statically * allocated. */ |