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

Unify the non-MALLOC_HEADER tests for PB_POINTER fields.

Browse Source 
Rather than testing PB_POINTER once for each field type,
test it just in decode_field().

git-svn-id: https://svn.kapsi.fi/jpa/nanopb-dev@1084 e3a754e5-d11d-0410-8d38-ebb782a927b9
This commit is contained in:
Michael Poole
2011-12-20 11:47:59 +00:00
committed by Petteri Aimonen
parent ba93b65e9f
commit 3979f9137f
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pb_decode.c
View File

@@ -251,6 +251,11 @@ static bool checkreturn decode_field(pb_istream_t *stream, pb_wire_type_t wire_t
{ {
pb_decoder_t func = PB_DECODERS[PB_LTYPE(iter->current->type)]; pb_decoder_t func = PB_DECODERS[PB_LTYPE(iter->current->type)];
#ifndef MALLOC_HEADER
if (PB_POINTER(iter->current->type))
return false;
#endif
switch (PB_HTYPE(iter->current->type)) switch (PB_HTYPE(iter->current->type))
{ {
case PB_HTYPE_REQUIRED: case PB_HTYPE_REQUIRED:
@@ -590,9 +595,9 @@ bool checkreturn pb_dec_bytes(pb_istream_t *stream, const pb_field_t *field, voi
if (x->size > field->data_size) if (x->size > field->data_size)
return false; return false;
#ifdef MALLOC_HEADER
if (PB_POINTER(field->type)) if (PB_POINTER(field->type))
{ {
#ifdef MALLOC_HEADER
pb_bytes_t *x2 = (pb_bytes_t*)dest; pb_bytes_t *x2 = (pb_bytes_t*)dest;
if (x2->alloced < x2->size) if (x2->alloced < x2->size)
@@ -605,10 +610,8 @@ bool checkreturn pb_dec_bytes(pb_istream_t *stream, const pb_field_t *field, voi
} }
return pb_read(stream, x2->bytes, x2->size); return pb_read(stream, x2->bytes, x2->size);
#else
return false;
#endif
} }
#endif
return pb_read(stream, x->bytes, x->size); return pb_read(stream, x->bytes, x->size);
} }
@@ -623,19 +626,17 @@ bool checkreturn pb_dec_string(pb_istream_t *stream, const pb_field_t *field, vo
if (size > field->data_size - 1) if (size > field->data_size - 1)
return false; return false;
#ifdef MALLOC_HEADER
if (PB_POINTER(field->type)) if (PB_POINTER(field->type))
{ {
#ifdef MALLOC_HEADER
uint8_t *string = (uint8_t*)realloc(*(uint8_t**)dest, size + 1); uint8_t *string = (uint8_t*)realloc(*(uint8_t**)dest, size + 1);
if (!string) if (!string)
return false; return false;
*(uint8_t**)dest = string; *(uint8_t**)dest = string;
dest = string; dest = string;
#else
return false;
#endif
} }
#endif
status = pb_read(stream, (uint8_t*)dest, size); status = pb_read(stream, (uint8_t*)dest, size);
*((uint8_t*)dest + size) = 0; *((uint8_t*)dest + size) = 0;
@@ -656,9 +657,9 @@ bool checkreturn pb_dec_submessage(pb_istream_t *stream, const pb_field_t *field
msg = (const pb_message_t*)field->ptr; msg = (const pb_message_t*)field->ptr;
#ifdef MALLOC_HEADER
if (PB_POINTER(field->type)) if (PB_POINTER(field->type))
{ {
#ifdef MALLOC_HEADER
if (*(void**)dest == NULL) if (*(void**)dest == NULL)
{ {
void *object = calloc(1, msg->size); void *object = calloc(1, msg->size);
@@ -670,10 +671,8 @@ bool checkreturn pb_dec_submessage(pb_istream_t *stream, const pb_field_t *field
} else { } else {
dest = *(void**)dest; dest = *(void**)dest;
} }
#else
return false;
#endif
} }
#endif
status = pb_decode(&substream, msg, dest); status = pb_decode(&substream, msg, dest);
stream->state = substream.state; stream->state = substream.state;