aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-07 18:26:42 +0000
committerrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-07 18:26:42 +0000
commit2f0b554ab49f92fb94711fd1a3ccb58cabf8b5a7 (patch)
tree565ccdfcbcd18956c8370f268f4ecb702e63abcf
parentb993f8119df04a8218d060161e2ec2da13c85494 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@274627 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_dahdi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 40c34db90..1f0a398bd 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;
}
}