[svn-commits] russell: branch 1.6.0 r243852 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: russell
Date: Thu Jan 28 10:23:50 2010
New Revision: 243852

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=243852
Log:
Merged revisions 243780 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r243780 | russell | 2010-01-28 09:07:23 -0600 (Thu, 28 Jan 2010) | 9 lines
  
  Merged revisions 243779 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r243779 | russell | 2010-01-28 09:03:17 -0600 (Thu, 28 Jan 2010) | 2 lines
    
    Fix a bogus third argument to ast_copy_string().
  ........
................

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://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=243852&r1=243851&r2=243852
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Thu Jan 28 10:23:50 2010
@@ -15738,10 +15738,11 @@
 	} else  if (!strcasecmp(data, "peername")) {
 		ast_copy_string(buf, p->peername, len);
 	} else if (!strcasecmp(data, "t38passthrough")) {
-		if (p->t38.state == T38_DISABLED)
-			ast_copy_string(buf, "0", sizeof("0"));
-		else    /* T38 is offered or enabled in this call */
-			ast_copy_string(buf, "1", sizeof("1"));
+		if (p->t38.state == T38_DISABLED) {
+			ast_copy_string(buf, "0", len);
+		} else { /* T38 is offered or enabled in this call */
+			ast_copy_string(buf, "1", len);
+		}
 	} else {
 		ast_channel_unlock(chan);
 		return -1;