diff options
author | Krzysztof KosiĆski <krzysio@google.com> | 2021-12-06 19:04:42 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-06 19:04:42 +0000 |
commit | fffa37ba95b345f8e485bd5b847372379af3a65c (patch) | |
tree | 45680bae9335ed374090f4aee3812fe80c98accc /tests/regression/issue_504 | |
parent | ce669ebda92621e7efb655150803f0f03b05f3ab (diff) | |
parent | b1208c1f8196c18356bc99201f8e98e81ec83e07 (diff) | |
download | nanopb-c-fffa37ba95b345f8e485bd5b847372379af3a65c.tar.gz |
Upgrade nanopb to 0.3.9.8. am: b1208c1f81android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
Original change: https://android-review.googlesource.com/c/platform/external/nanopb-c/+/1911071
Change-Id: I302fb410274377eea0ede822422cfee2f0f779ee
Diffstat (limited to 'tests/regression/issue_504')
-rw-r--r-- | tests/regression/issue_504/SConscript | 12 | ||||
-rw-r--r-- | tests/regression/issue_504/test.c | 47 | ||||
-rw-r--r-- | tests/regression/issue_504/test.proto | 13 |
3 files changed, 72 insertions, 0 deletions
diff --git a/tests/regression/issue_504/SConscript b/tests/regression/issue_504/SConscript new file mode 100644 index 0000000..c303171 --- /dev/null +++ b/tests/regression/issue_504/SConscript @@ -0,0 +1,12 @@ +# Regression test for #504: +# Non empty submessage considered empty on FT_POINTER fields with address aligned on 0x100 + +Import('env', 'malloc_env') + +env.NanopbProto(["test.proto"]) +test = malloc_env.Program(["test.c", + "test.pb.c", + "$COMMON/pb_encode.o", + "$COMMON/pb_common.o"]) + +env.RunTest(test) diff --git a/tests/regression/issue_504/test.c b/tests/regression/issue_504/test.c new file mode 100644 index 0000000..1ca86db --- /dev/null +++ b/tests/regression/issue_504/test.c @@ -0,0 +1,47 @@ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <pb_encode.h> +#include "test.pb.h" +#include "unittests.h" + +const char STR[] = "test str"; +#define ALIGN 0x100 + +int main(int argc, char **argv) +{ + int status = 0; + uint8_t buffer[512] = {0}; + int i; + pb_ostream_t ostream; + MyMessage msg = MyMessage_init_zero; + char *pStr, *pStrAligned; + ostream = pb_ostream_from_buffer(buffer, sizeof(buffer)); + + /* copy STR to a malloced 0x100 aligned address */ + pStr = malloc(sizeof(STR) + ALIGN); + pStrAligned = (char*)((uintptr_t)(pStr + ALIGN) & ~(ALIGN - 1)); + memcpy(pStrAligned, STR, sizeof(STR)); + + msg.submessage.somestring = pStrAligned; + printf("%p: '%s'\n", msg.submessage.somestring, msg.submessage.somestring); + + if (!pb_encode(&ostream, MyMessage_fields, &msg)) { + fprintf(stderr, "Encode failed: %s\n", PB_GET_ERROR(&ostream)); + return 1; + } + + free(pStr); + msg.submessage.somestring = NULL; + + printf("response payload (%d):", (int)ostream.bytes_written); + for (i = 0; i < ostream.bytes_written; i++) { + printf("%02X", buffer[i]); + } + printf("\n"); + + TEST(ostream.bytes_written != 0); + + return status; +} + diff --git a/tests/regression/issue_504/test.proto b/tests/regression/issue_504/test.proto new file mode 100644 index 0000000..a5b0d9c --- /dev/null +++ b/tests/regression/issue_504/test.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +import "nanopb.proto"; + +message MyMessage +{ + SubMessage submessage = 1; +} + +message SubMessage +{ + string somestring = 1 [(nanopb).type = FT_POINTER]; +} |