From f20b015724f082c278a85853954ec94055fe0b02 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 7 Jun 2014 05:41:26 +0200 Subject: fix some client marshalling errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/mds-server/client.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/mds-server/client.c') diff --git a/src/mds-server/client.c b/src/mds-server/client.c index f927cb1..f9244ef 100644 --- a/src/mds-server/client.c +++ b/src/mds-server/client.c @@ -172,11 +172,12 @@ size_t client_marshal(const client_t* restrict this, char* restrict data) buf_set_next(data, uint64_t, this->id); n = mds_message_marshal_size(&(this->message)); buf_set_next(data, size_t, n); - mds_message_marshal(&(this->message), data); + if (n > 0) + mds_message_marshal(&(this->message), data); data += n / sizeof(char); buf_set_next(data, size_t, this->interception_conditions_count); for (i = 0; i < this->interception_conditions_count; i++) - data += interception_condition_marshal(this->interception_conditions + i, data) / sizeof(char); + data += n = interception_condition_marshal(this->interception_conditions + i, data) / sizeof(char); buf_set_next(data, size_t, this->multicasts_count); for (i = 0; i < this->multicasts_count; i++) data += multicast_marshal(this->multicasts + i, data) / sizeof(char); -- cgit v1.2.3-70-g09d2