From 1506450b119a504259983692cca4c8cd3daddaf1 Mon Sep 17 00:00:00 2001 From: Petteri Aimonen Date: Fri, 30 Dec 2011 08:43:50 +0000 Subject: Fixed a bug related to submessage encoding into memory buffer. Stream state was not copied back from substream in pb_enc_submessage, which caused garbage output if the stream callback modified the state. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Expanded tests to cover this problem. Thanks to Paweł Pery for debugging and reporting this problem. git-svn-id: https://svn.kapsi.fi/jpa/nanopb@1089 e3a754e5-d11d-0410-8d38-ebb782a927b9 --- tests/test_encode2.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 tests/test_encode2.c (limited to 'tests/test_encode2.c') diff --git a/tests/test_encode2.c b/tests/test_encode2.c new file mode 100644 index 00000000..b1105ce6 --- /dev/null +++ b/tests/test_encode2.c @@ -0,0 +1,32 @@ +/* Same as test_encode1.c, except writes directly to stdout. + */ + +#include +#include +#include "person.pb.h" + +/* This binds the pb_ostream_t into the stdout stream */ +bool streamcallback(pb_ostream_t *stream, const uint8_t *buf, size_t count) +{ + FILE *file = (FILE*) stream->state; + return fwrite(buf, 1, count, file) == count; +} + +int main() +{ + /* Initialize the structure with constants */ + Person person = {"Test Person 99", 99, true, "test@person.com", + 3, {{"555-12345678", true, Person_PhoneType_MOBILE}, + {"99-2342", false, 0}, + {"1234-5678", true, Person_PhoneType_WORK}, + }}; + + /* Prepare the stream, output goes directly to stdout */ + pb_ostream_t stream = {&streamcallback, stdout, SIZE_MAX, 0}; + + /* Now encode it and check if we succeeded. */ + if (pb_encode(&stream, Person_fields, &person)) + return 0; /* Success */ + else + return 1; /* Failure */ +} -- cgit