diff mbox

mgcp: Fix SDP formatting of fmtp_extra (Coverity)

Message ID 1402569758-8960-1-git-send-email-jerlbeck@sysmocom.de
State Accepted
Headers show

Commit Message

Jacob Erlbeck June 12, 2014, 10:42 a.m. UTC
Currently when ftmp_extra is set, a doubled a=rtpmap line is emitted
instead of the fmtp_extra info.

This patch fixes replaces the formerly copied and pasted but not
modified snprintf parameters by the correct ones.

Fixes: Coverity CID 1220873
Sponsored-by: On-Waves ehf
---
 openbsc/src/libmgcp/mgcp_protocol.c |  3 +--
 openbsc/tests/mgcp/mgcp_test.ok     | 24 ------------------------
 2 files changed, 1 insertion(+), 26 deletions(-)
diff mbox

Patch

diff --git a/openbsc/src/libmgcp/mgcp_protocol.c b/openbsc/src/libmgcp/mgcp_protocol.c
index f0457d1..6e48949 100644
--- a/openbsc/src/libmgcp/mgcp_protocol.c
+++ b/openbsc/src/libmgcp/mgcp_protocol.c
@@ -287,8 +287,7 @@  static int write_response_sdp(struct mgcp_endpoint *endp,
 
 		if (fmtp_extra) {
 			nchars = snprintf(sdp_record + len, size - len,
-					  "a=rtpmap:%d %s\r\n",
-					  payload_type, audio_name);
+					  "%s\r\n", fmtp_extra);
 
 			if (nchars < 0 || nchars >= size - len)
 				goto buffer_too_small;
diff --git a/openbsc/tests/mgcp/mgcp_test.ok b/openbsc/tests/mgcp/mgcp_test.ok
index 6c5a6bc..033f783 100644
--- a/openbsc/tests/mgcp/mgcp_test.ok
+++ b/openbsc/tests/mgcp/mgcp_test.ok
@@ -75,35 +75,11 @@  Detected packet duration: 20
 Requested packetization period not set
 Connection mode: 0: NONE
 Testing CRCX
-CRCX failed '200 2 OK
-I: 3
-
-v=0
-o=- 3 23 IN IP4 0.0.0.0
-c=IN IP4 0.0.0.0
-t=0 0
-m=audio 0 RTP/AVP 126
-a=rtpmap:126 AMR/8000
-a=rtpmap:126 AMR/8000
-a=ptime:20
-'
 Dummy packets: 1
 Detected packet duration: 40
 Requested packetetization period: 20-20
 Connection mode: 1: RECV
 Testing MDCX3
-MDCX3 failed '200 18983215 OK
-I: 3
-
-v=0
-o=- 3 23 IN IP4 0.0.0.0
-c=IN IP4 0.0.0.0
-t=0 0
-m=audio 0 RTP/AVP 126
-a=rtpmap:126 AMR/8000
-a=rtpmap:126 AMR/8000
-a=ptime:20
-'
 Dummy packets: 1
 Packet duration not set
 Requested packetization period not set