summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Haberman <joshua@reverberate.org>2009-07-07 18:15:17 -0700
committerJoshua Haberman <joshua@reverberate.org>2009-07-07 18:15:17 -0700
commit9c88385ba4b369c440a467d19fa656389f9212e5 (patch)
treeb83030eb1b94dd49527d996291140c6446868025
parent127adf4036baa5d6c41d59b4e2b3462b4180c2d6 (diff)
Fixed a logic bug in non-merging cases.
-rw-r--r--upb_msg.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/upb_msg.c b/upb_msg.c
index a618f2d..47a8662 100644
--- a/upb_msg.c
+++ b/upb_msg.c
@@ -336,6 +336,7 @@ void upb_msg_parse_reset(struct upb_msg_parse_state *s, void *msg,
s->merge = merge;
s->byref = byref;
if(!merge && msg == NULL) msg = upb_msgdata_new(m);
+ upb_msg_clear(msg, m);
set_frame_data(&s->s, m, msg);
s->s.tag_cb = tag_cb;
s->s.value_cb = value_cb;
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback