X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=pb_common.c;h=4fb7186b733f8fd0fad573eaf081457a9bcfbbb1;hb=112b5b1908f6a7094386c7721ffa97c7108daf68;hp=a9cade63914872add92b6cd66aaa322ad15e100d;hpb=7edf250a627b56c43e44de546b73bf113d9dea59;p=apps%2Fagl-service-can-low-level.git

diff --git a/pb_common.c b/pb_common.c
index a9cade63..4fb7186b 100644
--- a/pb_common.c
+++ b/pb_common.c
@@ -41,8 +41,15 @@ bool pb_field_iter_next(pb_field_iter_t *iter)
         /* Increment the pointers based on previous field size */
         size_t prev_size = prev_field->data_size;
     
-        if (PB_ATYPE(prev_field->type) == PB_ATYPE_STATIC &&
-            PB_HTYPE(prev_field->type) == PB_HTYPE_REPEATED)
+        if (PB_HTYPE(prev_field->type) == PB_HTYPE_ONEOF &&
+            PB_HTYPE(iter->pos->type) == PB_HTYPE_ONEOF &&
+            iter->pos->data_offset == PB_SIZE_MAX)
+        {
+            /* Don't advance pointers inside unions */
+            return true;
+        }
+        else if (PB_ATYPE(prev_field->type) == PB_ATYPE_STATIC &&
+                 PB_HTYPE(prev_field->type) == PB_HTYPE_REPEATED)
         {
             /* In static arrays, the data_size tells the size of a single entry and
              * array_size is the number of entries */
@@ -54,7 +61,7 @@ bool pb_field_iter_next(pb_field_iter_t *iter)
              * The data_size only applies to the dynamically allocated area. */
             prev_size = sizeof(void*);
         }
-        
+
         if (PB_HTYPE(prev_field->type) == PB_HTYPE_REQUIRED)
         {
             /* Count the required fields, in order to check their presence in the