Changeset 5639 for pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

Timestamp:

Aug 2, 2017 10:44:10 AM (7 years ago)

Author:

riza

Message:

Fix #2035: Make sure transport SRTP buf size is sufficient before calling
srtp_protect() and srtp_protect_rtcp().

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

@@ -69 +69 @@
 
 #define DEACTIVATE_MEDIA(pool, m)   pjmedia_sdp_media_deactivate(pool, m)
+
+#ifdef SRTP_MAX_TRAILER_LEN
+#   define MAX_TRAILER_LEN SRTP_MAX_TRAILER_LEN
+#else
+#   define MAX_TRAILER_LEN 10
+#endif
 
 static const pj_str_t ID_RTP_AVP  = { "RTP/AVP", 7 };
@@ -1063 +1069 @@
         return pjmedia_transport_send_rtp(srtp->member_tp, pkt, size);
 
-    if (size > sizeof(srtp->rtp_tx_buffer) - 10)
+    if (size > sizeof(srtp->rtp_tx_buffer) - MAX_TRAILER_LEN)
         return PJ_ETOOBIG;
 
@@ -1109 +1115 @@
     }
 
-    if (size > sizeof(srtp->rtcp_tx_buffer) - 10)
+    if (size > sizeof(srtp->rtcp_tx_buffer) - MAX_TRAILER_LEN)
         return PJ_ETOOBIG;