From bc4ded3b4314e0fbd181b3cc01635052b56d2b19 Mon Sep 17 00:00:00 2001
From: Petteri Aimonen <jpa@git.mail.kapsi.fi>
Date: Sun, 29 Dec 2013 18:34:57 +0200
Subject: Fix missing error messages in pb_encode.c

---
 pb_encode.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'pb_encode.c')

diff --git a/pb_encode.c b/pb_encode.c
index 476b111..c2d0e2c 100644
--- a/pb_encode.c
+++ b/pb_encode.c
@@ -226,7 +226,7 @@ static bool checkreturn encode_basic_field(pb_ostream_t *stream,
     {
         case PB_HTYPE_REQUIRED:
             if (!pData)
-                return false;
+                PB_RETURN_ERROR(stream, "missing required field");
             if (!pb_encode_tag_for_field(stream, field))
                 return false;
             if (!func(stream, field, pData))
@@ -499,7 +499,12 @@ bool checkreturn pb_encode_submessage(pb_ostream_t *stream, const pb_field_t fie
     bool status;
     
     if (!pb_encode(&substream, fields, src_struct))
+    {
+#ifndef PB_NO_ERRMSG
+        stream->errmsg = substream.errmsg;
+#endif
         return false;
+    }
     
     size = substream.bytes_written;
     
-- 
cgit