free(m->root_container.signature);
free(m->root_container.offsets);
- free(m->peeked_signature);
+ free(m->root_container.peeked_signature);
bus_creds_done(&m->creds);
free(m);
return r;
}
- assert(i <= c->n_offsets);
+ assert(!c->need_offsets || i <= c->n_offsets);
/* We need to add an offset for each item that has a
* variable size and that is not the last one in the
p += n;
}
- assert(i == c->n_offsets);
+ assert(!c->need_offsets || i == c->n_offsets);
+ assert(c->need_offsets || n_variable == 0);
if (n_variable <= 0) {
a = message_extend_body(m, 1, 0, add_offset);
w = m->containers + m->n_containers++;
w->enclosing = type;
w->signature = signature;
+ w->peeked_signature = NULL;
w->index = 0;
w->before = before;
}
free(c->signature);
+ free(c->peeked_signature);
free(c->offsets);
m->n_containers--;
if (!sig)
return -ENOMEM;
- free(m->peeked_signature);
- m->peeked_signature = sig;
-
- *contents = sig;
+ free(c->peeked_signature);
+ *contents = c->peeked_signature = sig;
}
if (type)
if (!sig)
return -ENOMEM;
- free(m->peeked_signature);
- m->peeked_signature = sig;
-
- *contents = sig;
+ free(c->peeked_signature);
+ *contents = c->peeked_signature = sig;
}
if (type)
if (k > c->item_size)
return -EBADMSG;
- free(m->peeked_signature);
- m->peeked_signature = strndup((char*) q + 1, k - 1);
- if (!m->peeked_signature)
+ free(c->peeked_signature);
+ c->peeked_signature = strndup((char*) q + 1, k - 1);
+ if (!c->peeked_signature)
return -ENOMEM;
- if (!signature_is_valid(m->peeked_signature, true))
+ if (!signature_is_valid(c->peeked_signature, true))
return -EBADMSG;
- *contents = m->peeked_signature;
+ *contents = c->peeked_signature;
} else {
size_t rindex, l;