]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Chaos: handle failed allocation in get_media_encryption_type 48/1148/1
authorScott Griepentrog <scott@griepentrog.com>
Wed, 26 Aug 2015 20:26:00 +0000 (15:26 -0500)
committerScott Griepentrog <sgriepentrog@digium.com>
Wed, 26 Aug 2015 20:32:28 +0000 (15:32 -0500)
If the ast_strndup() call fails to allocate a copy of the
transport string for parsing, fail gracefully.

ASTERISK-25323
Reported by: Scott Griepentrog

Change-Id: Ia4b905ce6d03da53fea526224455c1044b1a5a28

res/res_pjsip_sdp_rtp.c

index 0a5cbcbf9bd469432529ce581a2967534121d1ca..208d348334818a6032063331b00f01ddbfd08f30 100644 (file)
@@ -602,6 +602,9 @@ static enum ast_sip_session_media_encryption get_media_encryption_type(pj_str_t
 
        *optimistic = 0;
 
+       if (!transport_str) {
+               return AST_SIP_MEDIA_TRANSPORT_INVALID;
+       }
        if (strstr(transport_str, "UDP/TLS")) {
                return AST_SIP_MEDIA_ENCRYPT_DTLS;
        } else if (strstr(transport_str, "SAVP")) {