From: Petteri Aimonen <jpa@git.mail.kapsi.fi>
Date: Thu, 2 Mar 2017 20:14:00 +0000 (+0200)
Subject: Fix callback pointer corruption in proto3 mode (issue #249)
X-Git-Tag: 5.0.2~186^2~12
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=6ea1047a7f868796621f1ec9f7324f101e135733;p=apps%2Fagl-service-can-low-level.git

Fix callback pointer corruption in proto3 mode (issue #249)
---

diff --git a/pb_decode.c b/pb_decode.c
index a8cd61a7..e2e90caa 100644
--- a/pb_decode.c
+++ b/pb_decode.c
@@ -780,7 +780,7 @@ static void pb_field_set_to_default(pb_field_iter_t *iter)
     else if (PB_ATYPE(type) == PB_ATYPE_STATIC)
     {
         bool init_data = true;
-        if (PB_HTYPE(type) == PB_HTYPE_OPTIONAL)
+        if (PB_HTYPE(type) == PB_HTYPE_OPTIONAL && iter->pSize != iter->pData)
         {
             /* Set has_field to false. Still initialize the optional field
              * itself also. */