From 4ef0705ccd944d2bdbf87d01e9780c88a487e309 Mon Sep 17 00:00:00 2001 From: Jon Shallow Date: Mon, 8 May 2023 21:39:35 +0100 Subject: [PATCH] block.c: Handle missing / incorrect SIZE1 and SIZE2 options --- src/block.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/block.c b/src/block.c index 812f7833..9133bf05 100644 --- a/src/block.c +++ b/src/block.c @@ -1820,6 +1820,9 @@ coap_handle_request_put_block(coap_context_t *context, block.num--; if (update_data) { /* Update saved data */ + if (p->total_len < saved_offset + length) { + p->total_len = saved_offset + length; + } p->body_data = coap_block_build_body(p->body_data, length, data, saved_offset, p->total_len); if (!p->body_data) @@ -2427,6 +2430,9 @@ coap_handle_response_get_block(coap_context_t *context, /* Only process if not duplicate block */ if (updated_block) { if ((session->block_mode & COAP_BLOCK_SINGLE_BODY) || block.bert) { + if (size2 < saved_offset + length) { + size2 = saved_offset + length; + } p->body_data = coap_block_build_body(p->body_data, length, data, saved_offset, size2); if (p->body_data == NULL) {