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

Fix bug in decoder with packed arrays.

Browse Source 
Update issue 23
Status: FixedInGit
This commit is contained in:
Petteri Aimonen
2012-07-31 19:12:57 +03:00
parent 5703ad0c55
commit b582bc9bf6
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pb_decode.c
View File

@@ -288,6 +288,7 @@ static bool checkreturn decode_field(pb_istream_t *stream, pb_wire_type_t wire_t
&& PB_LTYPE(iter->current->type) <= PB_LTYPE_LAST_PACKABLE) && PB_LTYPE(iter->current->type) <= PB_LTYPE_LAST_PACKABLE)
{ {
/* Packed array */ /* Packed array */
bool status;
size_t *size = (size_t*)iter->pSize; size_t *size = (size_t*)iter->pSize;
pb_istream_t substream; pb_istream_t substream;
if (!make_string_substream(stream, &substream)) if (!make_string_substream(stream, &substream))
@@ -300,7 +301,9 @@ static bool checkreturn decode_field(pb_istream_t *stream, pb_wire_type_t wire_t
return false; return false;
(*size)++; (*size)++;
} }
return (substream.bytes_left == 0); status = (substream.bytes_left == 0);
stream->state = substream.state;
return status;
} }
else else
{ {