From 5bfa3c8ed61c724388b1b3e802cc8fe97b0709de Mon Sep 17 00:00:00 2001 From: Jonathan Aillet Date: Tue, 19 Jun 2018 16:24:24 +0200 Subject: Correct handling of incomming json messages Correct handling of incomming json messages. An error occured when a received json object was an array containing only one item. Change-Id: I2c6f27f0fd87e11c356b8d4e6bd02d472bc3d60b Signed-off-by: Jonathan Aillet --- 4a-hal/4a-hal-controllers/4a-hal-controllers-value-handler.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to '4a-hal/4a-hal-controllers/4a-hal-controllers-value-handler.c') diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-value-handler.c b/4a-hal/4a-hal-controllers/4a-hal-controllers-value-handler.c index 7c493b6..b027333 100644 --- a/4a-hal/4a-hal-controllers/4a-hal-controllers-value-handler.c +++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-value-handler.c @@ -65,9 +65,11 @@ int HalCtlsNormalizeJsonValues(AFB_ApiT apiHandle, struct CtlHalAlsaCtlPropertie { int err = 0, idx, count, initialValue, convertedValue; + json_type toConvertType; json_object *toConvertObjectJ, *convertedValueJ, *convertedArrayJ; - switch(json_object_get_type(toConvertJ)) { + toConvertType = json_object_get_type(toConvertJ); + switch(toConvertType) { case json_type_array: count = (int) json_object_array_length(toConvertJ); break; @@ -87,7 +89,7 @@ int HalCtlsNormalizeJsonValues(AFB_ApiT apiHandle, struct CtlHalAlsaCtlPropertie convertedArrayJ = json_object_new_array(); for(idx = 0; idx < count; idx++) { - if(count > 1) + if(toConvertType == json_type_array) toConvertObjectJ = json_object_array_get_idx(toConvertJ, idx); else toConvertObjectJ = toConvertJ; -- cgit 1.2.3-korg