kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-18 18:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: GCC 5.1.x catches some new const, array bounds and missing paren issues

Browse Source 
Fixed 1 issue in each of the affected files.

ASTERISK-25494 #close
Reported-by: George Joseph
Tested-by: George Joseph

Change-Id: I818f149cd66a93b062df421e1c73c7942f5a4a77
This commit is contained in:
George Joseph
2015-10-24 12:08:41 -06:00
parent 08fe5256a9
commit 4328d320c2
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
channels/chan_dahdi.c
View File

@@ -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) {

2
channels/sig_pri.c
View File

@@ -4680,7 +4680,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);