From: Russell Bryant <russell@russellbryant.com>
Date: Thu, 28 Jan 2010 16:23:50 +0000 (+0000)
Subject: Merged revisions 243780 via svnmerge from
X-Git-Tag: 1.6.0.23~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5df623fcbeb1c963bf4652c5cc031f2655aa67d5;p=thirdparty%2Fasterisk.git

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().
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@243852 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 3b51181478..6790d3c8a3 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -15738,10 +15738,11 @@ static int function_sipchaninfo_read(struct ast_channel *chan, const char *cmd,
 	} 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;