From 5f593e7c38b260a9769d0e01b1edf24098599cd7 Mon Sep 17 00:00:00 2001 From: George Joseph Date: Sat, 24 Oct 2015 12:08:41 -0600 Subject: 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 --- channels/chan_dahdi.c | 5 +++++ channels/sig_pri.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 248a7fd10..ef0ad651a 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -18833,6 +18833,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) { diff --git a/channels/sig_pri.c b/channels/sig_pri.c index 4b9139101..d6b850725 100644 --- a/channels/sig_pri.c +++ b/channels/sig_pri.c @@ -4682,7 +4682,7 @@ static void sig_pri_handle_subcmds(struct sig_pri_span *pri, int chanpos, int ev f.frametype = AST_FRAME_TEXT; f.subclass.integer = 0; f.offset = 0; - f.data.ptr = &subcmd->u.display.text; + f.data.ptr = (void *)&subcmd->u.display.text; f.datalen = subcmd->u.display.length + 1; ast_queue_frame(owner, &f); ast_channel_unlock(owner); -- cgit v1.2.3