From 018b447255188e79a7e11c7bb95d1910eae0a5b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20J=C3=A4ger?= Date: Tue, 5 Mar 2024 15:25:29 +0100 Subject: [PATCH] Text and binary mode: Fix array deserialization --- src/thingset_bin.c | 2 +- src/thingset_txt.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/thingset_bin.c b/src/thingset_bin.c index 62be923..0319d5c 100644 --- a/src/thingset_bin.c +++ b/src/thingset_bin.c @@ -652,7 +652,7 @@ static int bin_deserialize_value(struct thingset_context *ts, break; } index++; - } while (index < array->num_elements); + } while (index < array->max_elements); if (!check_only) { array->num_elements = index; diff --git a/src/thingset_txt.c b/src/thingset_txt.c index 8d8f514..9683b49 100644 --- a/src/thingset_txt.c +++ b/src/thingset_txt.c @@ -672,11 +672,15 @@ static int txt_deserialize_value(struct thingset_context *ts, break; } index++; - } while (index < array->num_elements); + } while (index < array->max_elements); if (!check_only) { array->num_elements = index; } + + if (err == -THINGSET_ERR_DESERIALIZATION_FINISHED) { + err = 0; + }; } return err;