diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-12 21:41:20 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-12 21:41:20 +0000 |
commit | 880d819fa534a731285899f412316c680f530dca (patch) | |
tree | 114323543c2e85888065d6f38eee1f7e8e461120 | |
parent | 64b5faaccbf5313e967713633298b0d179746ddd (diff) |
Merged revisions 175368 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r175368 | russell | 2009-02-12 15:41:01 -0600 (Thu, 12 Feb 2009) | 2 lines
Remove useless string copy, and make sscanf safe again
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@175369 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | channels/chan_sip.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index fc0f1c72a..053942b78 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -6835,7 +6835,6 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action iterator = req->sdp_start; while ((a = get_sdp_iterate(&iterator, req, "a"))[0] != '\0') { char mimeSubtype[128]; - ast_copy_string(mimeSubtype, a, sizeof(mimeSubtype)); if (option_debug > 1) { int breakout = FALSE; @@ -6909,7 +6908,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action ast_rtp_codec_setpref(p->rtp, pref); } continue; - } else if (sscanf(a, "rtpmap: %u %[^/]/", &codec, mimeSubtype) == 2) { + } else if (sscanf(a, "rtpmap: %u %127[^/]/", &codec, mimeSubtype) == 2) { /* We have a rtpmap to handle */ if (last_rtpmap_codec < SDP_MAX_RTPMAP_CODECS) { |