diff options
| author | George Joseph <george.joseph@fairview5.com> | 2015-10-24 12:08:41 -0600 |
|---|---|---|
| committer | George Joseph <george.joseph@fairview5.com> | 2015-10-24 16:08:54 -0500 |
| commit | 4328d320c2aba32b7848b46a8963fbb7308a18c2 (patch) | |
| tree | 48bf3dda1e92202a9252f018d1fb307159d954fe /channels/chan_dahdi.c | |
| parent | 08fe5256a90c70955110c3a64ee252b319809d35 (diff) | |
build: GCC 5.1.x catches some new const, array bounds and missing paren issues
Fixed 1 issue in each of the affected files.
ASTERISK-25494 #close
Reported-by: George Joseph
Tested-by: George Joseph
Change-Id: I818f149cd66a93b062df421e1c73c7942f5a4a77
Diffstat (limited to 'channels/chan_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index c17e4f891..697c720e3 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -18832,6 +18832,11 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct cadence_is_ok = 0; } + /* 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; + } + /* Ring cadences cannot be negative */ for (i = 0; i < element_count; i++) { if (c[i] == 0) { |