Merge "chan_dahdi.c: Fix bounds check regression."

changes/19/4619/2
Joshua Colp 8 years ago committed by Gerrit Code Review
commit 1943ece514

@ -18826,8 +18826,8 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
} }
/* This check is only needed to satisfy the compiler that element_count can't cause an out of bounds */ /* This check is only needed to satisfy the compiler that element_count can't cause an out of bounds */
if (element_count >= ARRAY_LEN(c)) { if (element_count > ARRAY_LEN(c)) {
element_count = ARRAY_LEN(c) - 1; element_count = ARRAY_LEN(c);
} }
/* Ring cadences cannot be negative */ /* Ring cadences cannot be negative */

Loading…
Cancel
Save