Add regression test for issue #227

4 files changed, 39 insertions, 1 deletions

diff --git a/tests/SConstruct b/tests/SConstruct
index d8ab9ab0..f2abe042 100644
--- a/tests/SConstruct
+++ b/tests/SConstruct
@@ -93,7 +93,9 @@ if not env.GetOption('clean'):
             conf.env.Append(CORECFLAGS = extra)
     
     # Check if we can use undefined behaviour sanitizer (only with clang)
-    extra = '-fsanitize=undefined '
+    # TODO: Fuzz test triggers the bool sanitizer, figure out whether to
+    #       modify the fuzz test or to keep ignoring the check.
+    extra = '-fsanitize=undefined -fno-sanitize-recover=undefined -fsanitize-recover=bool '
     if 'clang' in env['CC']:
         if conf.CheckCCFLAGS(extra, linkflags = extra):
             conf.env.Append(CORECFLAGS = extra)
diff --git a/tests/regression/issue_227/SConscript b/tests/regression/issue_227/SConscript
new file mode 100644
index 00000000..10741240
--- /dev/null
+++ b/tests/regression/issue_227/SConscript
@@ -0,0 +1,14 @@
+# Regression test for Issue 227:Using proto3 type fields can cause unaligned access
+# NOTE: This test will only detect problems when run with clang sanitizer (which
+# is done regularly by a jenkins run).
+
+Import('env')
+
+env.NanopbProto('unaligned_uint64')
+
+p = env.Program(["unaligned_uint64.c",
+                 "unaligned_uint64.pb.c",
+                 "$COMMON/pb_encode.o",
+                 "$COMMON/pb_common.o"])
+env.RunTest(p)
+
diff --git a/tests/regression/issue_227/unaligned_uint64.c b/tests/regression/issue_227/unaligned_uint64.c
new file mode 100644
index 00000000..17c1d779
--- /dev/null
+++ b/tests/regression/issue_227/unaligned_uint64.c
@@ -0,0 +1,14 @@
+#include "unaligned_uint64.pb.h"
+#include <pb_encode.h>
+
+int main()
+{
+    uint8_t buf[128];
+    pb_ostream_t stream = pb_ostream_from_buffer(buf, sizeof(buf));
+    MainMessage msg = MainMessage_init_zero;
+    msg.bar[0] = 'A';
+    pb_encode(&stream, MainMessage_fields, &msg);
+    
+    return 0;
+}
+
diff --git a/tests/regression/issue_227/unaligned_uint64.proto b/tests/regression/issue_227/unaligned_uint64.proto
new file mode 100644
index 00000000..f0269f60
--- /dev/null
+++ b/tests/regression/issue_227/unaligned_uint64.proto
@@ -0,0 +1,8 @@
+syntax = "proto3";
+import 'nanopb.proto';
+
+message MainMessage {
+    string foo = 1 [(nanopb).max_size = 3];
+    string bar = 2 [(nanopb).max_size = 8];
+}
+