cellular-infrastructure
/
osmo-bts
mirror of https://gerrit.osmocom.org/osmo-bts
9
0
Fork 0
Code Issues Releases Wiki Activity

DTX: fix array size calculation 

Compute array size in-place and pass it to function.

Change-Id: I4cd480ceb20efc69df1b00e3c7359fcbd14c19cd
Fixes: coverity CID 1357844.
This commit is contained in:
Max 2016-10-06 12:41:58 +02:00 committed by Harald Welte
parent de9dbe7958
commit b058778df1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/msg_utils.c
View File

@ -234,10 +234,10 @@ static inline bool dtx_amr_sid_optional(const struct gsm_lchan *lchan,
return false;
}
static inline bool fn_chk(const uint8_t *t, uint32_t fn)
static inline bool fn_chk(const uint8_t *t, uint32_t fn, uint8_t len)
{
uint8_t i;
for (i = 0; i < ARRAY_SIZE(t); i++)
for (i = 0; i < len; i++)
if (fn % 104 == t[i])
return false;
return true;
@ -256,9 +256,10 @@ static inline bool dtx_sched_optional(struct gsm_lchan *lchan, uint32_t fn)
h1[] = { 14, 16, 18, 20, 66, 68, 70, 72 };
if (lchan->tch_mode == GSM48_CMODE_SPEECH_V1) {
if (lchan->type == GSM_LCHAN_TCH_F)
return fn_chk(f, fn);
return fn_chk(f, fn, ARRAY_SIZE(f));
else
return fn_chk(lchan->nr ? h1 : h0, fn);
return fn_chk(lchan->nr ? h1 : h0, fn,
ARRAY_SIZE(lchan->nr ? h1 : h0));
}
return false;
}