From 6a285141d9cb1c665c090ae53217854d4126a28f Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 15 Sep 2014 15:36:03 +0200 Subject: [PATCH] libubus: rework buffer allocation code Signed-off-by: Felix Fietkau --- libubus-io.c | 44 +++++++++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/libubus-io.c b/libubus-io.c index 55ddff5..fa53040 100644 --- a/libubus-io.c +++ b/libubus-io.c @@ -231,6 +231,36 @@ static bool ubus_validate_hdr(struct ubus_msghdr *hdr) return true; } +static bool alloc_msg_buf(struct ubus_context *ctx, int len) +{ + void *ptr; + int buf_len = ctx->msgbuf_data_len; + int rem; + + if (!ctx->msgbuf.data) + buf_len = 0; + + rem = (len % UBUS_MSG_CHUNK_SIZE); + if (rem > 0) + len += UBUS_MSG_CHUNK_SIZE - rem; + + if (len < buf_len && + ++ctx->msgbuf_reduction_counter > UBUS_MSGBUF_REDUCTION_INTERVAL) { + ctx->msgbuf_reduction_counter = 0; + buf_len = 0; + } + + if (len <= buf_len) + return true; + + ptr = realloc(ctx->msgbuf.data, len); + if (!ptr) + return false; + + ctx->msgbuf.data = ptr; + return true; +} + static bool get_next_msg(struct ubus_context *ctx, int *recv_fd) { struct { @@ -254,19 +284,7 @@ static bool get_next_msg(struct ubus_context *ctx, int *recv_fd) return false; len = blob_raw_len(&hdrbuf.data); - if (len > ctx->msgbuf_data_len) - ctx->msgbuf_reduction_counter = UBUS_MSGBUF_REDUCTION_INTERVAL; - else if (ctx->msgbuf_reduction_counter > 0 && len < UBUS_MSG_CHUNK_SIZE) - len = !--ctx->msgbuf_reduction_counter ? UBUS_MSG_CHUNK_SIZE : -1; - else - len = -1; - - if (len > -1) { - ctx->msgbuf.data = realloc(ctx->msgbuf.data, len * sizeof(char)); - if (ctx->msgbuf.data) - ctx->msgbuf_data_len = len; - } - if (!ctx->msgbuf.data) + if (!alloc_msg_buf(ctx, len)) return false; memcpy(&ctx->msgbuf.hdr, &hdrbuf.hdr, sizeof(hdrbuf.hdr));