From 623e5674bac1b876eac0df74f9a4171ca16998bb Mon Sep 17 00:00:00 2001 From: Lorenzo Miniero Date: Mon, 25 Nov 2024 12:49:01 +0100 Subject: [PATCH] Don't use ternary operator for JSON validator check (see #3466) --- src/plugins/janus_sip.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/plugins/janus_sip.c b/src/plugins/janus_sip.c index a4d187fad6..1906ecb39a 100644 --- a/src/plugins/janus_sip.c +++ b/src/plugins/janus_sip.c @@ -3990,10 +3990,15 @@ static void *janus_sip_handler(void *data) { goto error; } janus_mutex_unlock(&session->mutex); - struct janus_json_parameter *params = progress ? progress_parameters : accept_parameters; - JANUS_VALIDATE_JSON_OBJECT(root, params, - error_code, error_cause, TRUE, - JANUS_SIP_ERROR_MISSING_ELEMENT, JANUS_SIP_ERROR_INVALID_ELEMENT); + if(progress) { + JANUS_VALIDATE_JSON_OBJECT(root, progress_parameters, + error_code, error_cause, TRUE, + JANUS_SIP_ERROR_MISSING_ELEMENT, JANUS_SIP_ERROR_INVALID_ELEMENT); + } else { + JANUS_VALIDATE_JSON_OBJECT(root, accept_parameters, + error_code, error_cause, TRUE, + JANUS_SIP_ERROR_MISSING_ELEMENT, JANUS_SIP_ERROR_INVALID_ELEMENT); + } if(error_code != 0) goto error; json_t *srtp = json_object_get(root, "srtp");