From: Sean Bright <sean@malleable.com>
Date: Tue, 2 Sep 2008 18:15:54 +0000 (+0000)
Subject: Merged revisions 140605 via svnmerge from
X-Git-Tag: 1.6.2.0-beta1~1337
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f3111835bb0ff31d82f72d8a46d844d0c0349bb7;p=thirdparty%2Fasterisk.git

Merged revisions 140605 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140605 | seanbright | 2008-09-02 14:14:57 -0400 (Tue, 02 Sep 2008) | 8 lines

Make sure to use the correct length of the mohinterpret and mohsuggest
buffers when copying configuration values.

(closes issue #13336)
Reported by: decryptus_proformatique
Patches:
      chan_iax2_mohinterpret_mohsuggest_general_settings.patch uploaded by decryptus (license 555)

........


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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index d2727f4221..ce1fac9824 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -11233,9 +11233,9 @@ static int set_config(char *config_file, int reload)
 		} else if (!strcasecmp(v->name, "accountcode")) {
 			ast_copy_string(accountcode, v->value, sizeof(accountcode));
 		} else if (!strcasecmp(v->name, "mohinterpret")) {
-			ast_copy_string(mohinterpret, v->value, sizeof(user->mohinterpret));
+			ast_copy_string(mohinterpret, v->value, sizeof(mohinterpret));
 		} else if (!strcasecmp(v->name, "mohsuggest")) {
-			ast_copy_string(mohsuggest, v->value, sizeof(user->mohsuggest));
+			ast_copy_string(mohsuggest, v->value, sizeof(mohsuggest));
 		} else if (!strcasecmp(v->name, "amaflags")) {
 			format = ast_cdr_amaflags2int(v->value);
 			if (format < 0) {