From: Richard Mudgett <rmudgett@digium.com>
Date: Wed, 7 Jul 2010 18:26:42 +0000 (+0000)
Subject: Merged revisions 274595 via svnmerge from
X-Git-Tag: 1.6.2.11-rc1~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ce17c6872c178de23d6ab3165f7cf915c2dfd19;p=thirdparty%2Fasterisk.git

Merged revisions 274595 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r274595 | rmudgett | 2010-07-07 13:20:00 -0500 (Wed, 07 Jul 2010) | 9 lines

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

  ........
    r274579 | rmudgett | 2010-07-07 13:12:41 -0500 (Wed, 07 Jul 2010) | 1 line

    Close the DAHDI FD on error when processing chan_dahdi toneduration config parameter.
  ........
................


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

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 40c34db904..1f0a398bdc 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -17116,6 +17116,7 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
 					res = ioctl(ctlfd, DAHDI_SET_DIALPARAMS, &dps);
 					if (res < 0) {
 						ast_log(LOG_ERROR, "Invalid tone duration: %d ms at line %d: %s\n", toneduration, v->lineno, strerror(errno));
+						close(ctlfd);
 						return -1;
 					}
 				}