diff options
| author |   Jonathan Aillet <jonathan.aillet@iot.bzh> | 2018-06-19 16:24:24 +0200 |
|---|---|---|
| committer | Jonathan Aillet <jonathan.aillet@iot.bzh> | 2018-10-08 15:53:53 +0200 |
| commit | 5bfa3c8ed61c724388b1b3e802cc8fe97b0709de (patch) | |
| tree | b8168d37b7e824e87c02194e3d6af961d0f88984 /4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.c | |
| parent | 8bbfce60e809f867c502f836c49ef70b9c4a0c63 (diff) | |
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 <jonathan.aillet@iot.bzh>
Diffstat (limited to '4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.c')
| -rw-r--r-- | 4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.c b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.c index 346c93a..082de3a 100644 --- a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.c +++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.c @@ -43,9 +43,11 @@ int HalCtlsHandleMixerData(AFB_ApiT apiHandle, struct CtlHalMixerDataT *currentM char *currentDataVerbName, *currentStreamCardId; + json_type currentDataType; json_object *currentJ; - switch(json_object_get_type(currentDataJ)) { + currentDataType = json_object_get_type(currentDataJ); + switch(currentDataType) { case json_type_object: currentMixerDataT->count = 1; break; @@ -61,7 +63,7 @@ int HalCtlsHandleMixerData(AFB_ApiT apiHandle, struct CtlHalMixerDataT *currentM currentMixerDataT->data = (struct CtlHalMixerData *) calloc(currentMixerDataT->count, sizeof(struct CtlHalMixerData)); for(idx = 0; idx < currentMixerDataT->count; idx++) { - if(currentMixerDataT->count > 1) + if(currentDataType == json_type_array) currentJ = json_object_array_get_idx(currentDataJ, (int) idx); else currentJ = currentDataJ; |