diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2017-07-11 13:20:48 -0500 |
---|---|---|
committer | Joshua Haberman <jhaberman@gmail.com> | 2017-07-11 13:20:48 -0500 |
commit | 717a030083cad1c2644d1d32f3284bd7a461b392 (patch) | |
tree | 7d9d8ac99842cca1acf76dc4a88a22a426e1d46b /upb/msg.c | |
parent | af43ea72b549aa36a73d691d7b562ec67f04def3 (diff) | |
parent | 3e8acc3f4e4a2045b04dd8794c87b2a198542382 (diff) |
Merge branch 'gencode' into gencode2
Diffstat (limited to 'upb/msg.c')
-rw-r--r-- | upb/msg.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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) { |