FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dahdi: Reduce 'chans' dereferencing in dahdi_check_conf

Browse Source 
Review: https://reviewboard.asterisk.org/r/905/

Signed-off-by: Shaun Ruffell <sruffell@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9366 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell
2010-09-20 20:33:23 +00:00
parent 3e6b113991
commit eb89c39f84
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/dahdi/dahdi-base.c
View File

@@ -922,12 +922,14 @@ static void dahdi_check_conf(int x)
return;
for (y = 0; y < maxchans; y++) {
if (chans[y] && (chans[y]->confna == x) &&
((chans[y]->confmode & DAHDI_CONF_MODE_MASK) == DAHDI_CONF_CONF ||
(chans[y]->confmode & DAHDI_CONF_MODE_MASK) == DAHDI_CONF_CONFANN ||
(chans[y]->confmode & DAHDI_CONF_MODE_MASK) == DAHDI_CONF_CONFMON ||
(chans[y]->confmode & DAHDI_CONF_MODE_MASK) == DAHDI_CONF_CONFANNMON ||
(chans[y]->confmode & DAHDI_CONF_MODE_MASK) == DAHDI_CONF_REALANDPSEUDO)) {
struct dahdi_chan *const chan = chans[y];
const int confmode = chan->confmode & DAHDI_CONF_MODE_MASK;
if (chan && (chan->confna == x) &&
(confmode == DAHDI_CONF_CONF ||
confmode == DAHDI_CONF_CONFANN ||
confmode == DAHDI_CONF_CONFMON ||
confmode == DAHDI_CONF_CONFANNMON ||
confmode == DAHDI_CONF_REALANDPSEUDO)) {
return;
}
}