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

This commit is contained in:
Joshua Colp
2016-12-19 19:48:31 -06:00
committed by Gerrit Code Review
+2 -2
View File
@@ -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 */
if (element_count >= ARRAY_LEN(c)) {
element_count = ARRAY_LEN(c) - 1;
if (element_count > ARRAY_LEN(c)) {
element_count = ARRAY_LEN(c);
}
/* Ring cadences cannot be negative */