aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-07 18:20:00 +0000
committerrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-07 18:20:00 +0000
commitadb9ff9648a143dc3ea83079cc18941c35a1cde4 (patch)
tree10d987db68bf645e7bd1520322a6249b9e80b522
parentdc4e599ca95a31a6cc0a1554d26c58dd58b2d4f9 (diff)
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/trunk@274595 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 e2cad3fef..2e4de8c6c 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;
}
}