rik/nanopb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for empty message type before incrementing required_field_index.

Browse Source 
If you have a message that defined as empty, but attempt to decode a
message that has one or more unknown fields then pb_decode fails. The
method used to count the number of required fields counts 1 required
field because the default type of PB_LAST_FIELD is PB_HTYPE_REQUIRED.
This commit is contained in:
Kent Ryhorchuk
2013-07-15 18:04:47 -07:00
committed by Petteri Aimonen
parent a01856f4ab
commit 3c10e6fa71
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pb_decode.c
View File

@@ -308,12 +308,12 @@ static bool pb_field_next(pb_field_iterator_t *iter)
prev_size *= iter->pos->array_size; prev_size *= iter->pos->array_size;
} }
if (PB_HTYPE(iter->pos->type) == PB_HTYPE_REQUIRED)
iter->required_field_index++;
if (iter->pos->tag == 0) if (iter->pos->tag == 0)
return false; /* Only happens with empty message types */ return false; /* Only happens with empty message types */
if (PB_HTYPE(iter->pos->type) == PB_HTYPE_REQUIRED)
iter->required_field_index++;
iter->pos++; iter->pos++;
iter->field_index++; iter->field_index++;
if (iter->pos->tag == 0) if (iter->pos->tag == 0)