[asterisk-commits] russell: branch 1.6.0 r175369 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Feb 12 15:41:20 2009
New Revision: 175369

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=175369
Log:
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

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=175369&r1=175368&r2=175369
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Thu Feb 12 15:41:20 2009
@@ -6835,7 +6835,6 @@
 	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 @@
 				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) {