From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 3 Mar 2009 16:45:46 +0000 (+0000)
Subject: Ensure chan->fdno always gets reset to -1 after handling a channel fd event.
X-Git-Tag: 1.4.24-rc1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e4471d758f9f896e6c6847812aae73bab1884a9;p=thirdparty%2Fasterisk.git

Ensure chan->fdno always gets reset to -1 after handling a channel fd event.

Since setting fdno to -1 had to be moved, a couple of other code paths that
do process an fd event return early and do not pass through the code path
where it was moved to.  So, set it to -1 in a few other places, too.


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

diff --git a/main/channel.c b/main/channel.c
index 58861add9c..07bc5d474f 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -2105,12 +2105,14 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio)
 				/* save a copy of func/data before unlocking the channel */
 				int (*func)(const void *) = chan->timingfunc;
 				void *data = chan->timingdata;
+				chan->fdno = -1;
 				ast_channel_unlock(chan);
 				func(data);
 			} else {
 				blah = 0;
 				ioctl(chan->timingfd, DAHDI_TIMERCONFIG, &blah);
 				chan->timingdata = NULL;
+				chan->fdno = -1;
 				ast_channel_unlock(chan);
 			}
 			/* cannot 'goto done' because the channel is already unlocked */
@@ -2128,6 +2130,7 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio)
 		chan->generator->generate(chan, tmp, -1, -1);
 		chan->generatordata = tmp;
 		f = &ast_null_frame;
+		chan->fdno = -1;
 		goto done;
 	}
 
@@ -2185,7 +2188,7 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio)
 			ast_log(LOG_WARNING, "No read routine on channel %s\n", chan->name);
 	}
 
-        /*
+	/*
 	 * Reset the recorded file descriptor that triggered this read so that we can
 	 * easily detect when ast_read() is called without properly using ast_waitfor().
 	 */