summaryrefslogtreecommitdiff
path: root/upb/msg.c
diff options
context:
space:
mode:
authorJoshua Haberman <jhaberman@gmail.com>2017-07-11 13:20:48 -0500
committerJoshua Haberman <jhaberman@gmail.com>2017-07-11 13:20:48 -0500
commit717a030083cad1c2644d1d32f3284bd7a461b392 (patch)
tree7d9d8ac99842cca1acf76dc4a88a22a426e1d46b /upb/msg.c
parentaf43ea72b549aa36a73d691d7b562ec67f04def3 (diff)
parent3e8acc3f4e4a2045b04dd8794c87b2a198542382 (diff)
Merge branch 'gencode' into gencode2
Diffstat (limited to 'upb/msg.c')
-rw-r--r--upb/msg.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/upb/msg.c b/upb/msg.c
index 129d881..34525b7 100644
--- a/upb/msg.c
+++ b/upb/msg.c
@@ -699,12 +699,15 @@ size_t upb_msg_sizeof(const upb_msglayout *l) {
upb_msg *upb_msg_init(void *mem, const upb_msglayout *l, upb_alloc *a) {
upb_msg *msg = VOIDPTR_AT(mem, upb_msg_internalsize(l));
+
+ /* Initialize normal members. */
if (l->data.default_msg) {
memcpy(msg, l->data.default_msg, l->data.size);
} else {
memset(msg, 0, l->data.size);
}
+ /* Initialize internal members. */
upb_msg_getinternal(msg)->alloc = a;
if (l->data.extendable) {
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback