Add regression test for issue #249

diff --git a/tests/regression/issue_249/SConscript b/tests/regression/issue_249/SConscript
new file mode 100644 (file)
index 0000000..ba66712
--- /dev/null
+++ b/tests/regression/issue_249/SConscript
@@ -0,0 +1,12 @@
+# Regression test for Issue 249: proto3 mode pb_decode() corrupts callback fields
+Import('env')
+
+env.NanopbProto('test')
+
+p = env.Program(["test.c",
+                 "test.pb.c",
+                 "$COMMON/pb_decode.o",
+                 "$COMMON/pb_encode.o",
+                 "$COMMON/pb_common.o"])
+env.RunTest(p)
+

diff --git a/tests/regression/issue_249/test.c b/tests/regression/issue_249/test.c
new file mode 100644 (file)
index 0000000..a37180f
--- /dev/null
+++ b/tests/regression/issue_249/test.c
@@ -0,0 +1,59 @@
+#include "test.pb.h"
+#include <unittests.h>
+#include <pb_encode.h>
+#include <pb_decode.h>
+
+static bool write_array(pb_ostream_t *stream, const pb_field_t *field, void * const *arg)
+{
+    int i;
+    for (i = 0; i < 5; i++)
+    {
+        if (!pb_encode_tag_for_field(stream, field))
+            return false;
+        if (!pb_encode_varint(stream, 1000 + i))
+            return false;
+    }
+    
+    return true;
+}
+
+static bool read_array(pb_istream_t *stream, const pb_field_t *field, void **arg)
+{
+    uint32_t i;
+    int *sum = *arg;
+    
+    if (!pb_decode_varint32(stream, &i))
+        return false;
+    
+    *sum += i;
+    
+    return true;
+}
+
+int main()
+{
+    int status = 0;
+    pb_byte_t buf[128] = {0};
+    pb_size_t msglen;
+    
+    {
+        MainMessage msg = MainMessage_init_zero;
+        pb_ostream_t stream = pb_ostream_from_buffer(buf, sizeof(buf));
+        msg.submsg.foo.funcs.encode = &write_array;
+        TEST(pb_encode(&stream, MainMessage_fields, &msg));
+        msglen = stream.bytes_written;
+    }
+    
+    {
+        MainMessage msg = MainMessage_init_zero;
+        pb_istream_t stream = pb_istream_from_buffer(buf, msglen);
+        int sum = 0;
+        msg.submsg.foo.funcs.decode = &read_array;
+        msg.submsg.foo.arg = &sum;
+        TEST(pb_decode(&stream, MainMessage_fields, &msg));
+        TEST(sum == 1000 + 1001 + 1002 + 1003 + 1004);
+    }
+    
+    return status;
+}
+

diff --git a/tests/regression/issue_249/test.proto b/tests/regression/issue_249/test.proto
new file mode 100644 (file)
index 0000000..eaa2abd
--- /dev/null
+++ b/tests/regression/issue_249/test.proto
@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+message SubMessage {
+    repeated int32 foo = 1;
+}
+
+message MainMessage {
+    SubMessage submsg = 1;
+}
+