]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
res_pjsip_stir_shaken.c: Add checks for missing parameters
authorGeorge Joseph <gjoseph@sangoma.com>
Mon, 11 Mar 2024 15:41:14 +0000 (09:41 -0600)
committerGeorge Joseph <gjoseph@sangoma.com>
Mon, 11 Mar 2024 16:43:24 +0000 (16:43 +0000)
* Added checks for missing session, session->channel and rdata
  in stir_shaken_incoming_request.

* Added checks for missing session, session->channel and tdata
  in stir_shaken_outgoing_request.

Resolves: #645

res/res_pjsip_stir_shaken.c

index 1e364e25193ed64444735039bd06ea2b17e5b2db..fa2103a8574318f47346b411c56337c2d0b9831d 100644 (file)
@@ -211,6 +211,16 @@ static int stir_shaken_incoming_request(struct ast_sip_session *session, pjsip_r
        enum process_failure_rc p_rc;
        SCOPE_ENTER(1, "%s: Enter\n", session_name);
 
+       if (!session) {
+               SCOPE_EXIT_LOG_RTN_VALUE(1, LOG_ERROR, "No session\n");
+       }
+       if (!session->channel) {
+               SCOPE_EXIT_LOG_RTN_VALUE(1, LOG_ERROR, "%s: No channel\n", session_name);
+       }
+       if (!rdata) {
+               SCOPE_EXIT_LOG_RTN_VALUE(1, LOG_ERROR, "%s: No rdata\n", session_name);
+       }
+
        /* Check if this is a reinvite. If it is, we don't need to do anything */
        if (rdata->msg_info.to->tag.slen) {
                SCOPE_EXIT_RTN_VALUE(0, "%s: Reinvite. No action needed\n", session_name);
@@ -401,6 +411,16 @@ static void stir_shaken_outgoing_request(struct ast_sip_session *session,
        const char *session_name = ast_sip_session_get_name(session);
        SCOPE_ENTER(1, "%s: Enter\n", session_name);
 
+       if (!session) {
+               SCOPE_EXIT_LOG_RTN(LOG_ERROR, "No session\n");
+       }
+       if (!session->channel) {
+               SCOPE_EXIT_LOG_RTN(LOG_ERROR, "%s: No channel\n", session_name);
+       }
+       if (!tdata) {
+               SCOPE_EXIT_LOG_RTN(LOG_ERROR, "%s: No tdata\n", session_name);
+       }
+
        old_identity = pjsip_msg_find_hdr_by_name(tdata->msg, &identity_hdr_str, NULL);
        if (old_identity) {
                SCOPE_EXIT_RTN("Found an existing Identity header\n");