3party/protobuf-c
0
0
Fork 0
mirror of https://github.com/protobuf-c/protobuf-c.git synced 2024-12-27 13:31:02 +08:00
Code Issues Projects Releases Wiki Activity

Fix "is zeroish" evaluation for proto3

Browse Source 
In proto3 the default value is zero (NULL for pointers and 0 for
scalars). However when checking we still need to test by type
because poinetr types have an extra indirection.
This commit is contained in:
Paolo Borelli 2017-04-09 10:51:35 +02:00
parent 39967de734
commit 1c8805a780
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
protobuf-c/protobuf-c.c
View File

@ -523,6 +523,20 @@ optional_field_get_packed_size(const ProtobufCFieldDescriptor *field,
return required_field_get_packed_size(field, member);
}
static protobuf_c_boolean
field_is_zeroish(const ProtobufCFieldDescriptor *field,
const void *member)
{
if (field->type == PROTOBUF_C_TYPE_MESSAGE ||
field->type == PROTOBUF_C_TYPE_STRING)
{
const void *ptr = *(const void * const *) member;
if (ptr == NULL)
return TRUE;
}
return member == NULL;
}
/**
* Calculate the serialized size of a single unlabeled message field, including
* the space needed by the preceding tag. Returns 0 if the field isn't set or
@ -540,10 +554,8 @@ static size_t
unlabeled_field_get_packed_size(const ProtobufCFieldDescriptor *field,
const void *member)
{
const void *ptr = *(const void * const *) member;
if (ptr == NULL) {
if (field_is_zeroish(field, member))
return 0;
}
return required_field_get_packed_size(field, member);
}
@ -1168,10 +1180,8 @@ static size_t
unlabeled_field_pack(const ProtobufCFieldDescriptor *field,
const void *member, uint8_t *out)
{
const void *ptr = *(const void * const *) member;
if (ptr == NULL) {
if (field_is_zeroish(field, member))
return 0;
}
return required_field_pack(field, member, out);
}
@ -1673,10 +1683,8 @@ static size_t
unlabeled_field_pack_to_buffer(const ProtobufCFieldDescriptor *field,
const void *member, ProtobufCBuffer *buffer)
{
const void *ptr = *(const void *const *) member;
if (ptr == NULL) {
if (field_is_zeroish(field, member))
return 0;
}
return required_field_pack_to_buffer(field, member, buffer);
}