From: Richard Mudgett <rmudgett@digium.com>
Date: Wed, 7 Jul 2010 18:20:00 +0000 (+0000)
Subject: Merged revisions 274579 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2727
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d20ca64e70232413cf19f25dd4d321387dcb56ef;p=thirdparty%2Fasterisk.git

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/trunk@274595 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index e2cad3fef9..2e4de8c6c7 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -17043,6 +17043,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;
 					}
 				}