summaryrefslogtreecommitdiff
path: root/upb/msg.c
diff options
context:
space:
mode:
authorJoshua Haberman <jhaberman@gmail.com>2017-07-10 21:52:27 -0500
committerJoshua Haberman <jhaberman@gmail.com>2017-07-10 21:52:27 -0500
commit3e8acc3f4e4a2045b04dd8794c87b2a198542382 (patch)
tree452fb21921c6243d3298b879551e5e85eb8f38bc /upb/msg.c
parent28268113678e869ffa42eb20cab0c338f55142dc (diff)
Removed incorrect assert and added comments.
Diffstat (limited to 'upb/msg.c')
-rw-r--r--upb/msg.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/upb/msg.c b/upb/msg.c
index 5729408..850e86e 100644
--- a/upb/msg.c
+++ b/upb/msg.c
@@ -701,13 +701,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);
}
- UPB_ASSERT(!upb_msg_getinternal(msg)->alloc);
+ /* 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