[asterisk-commits] build: GCC 5.1.x catches some new const, array bounds and mi... (asterisk[certified/11.6])

[SVN commits to the Asterisk project]

Joshua Colp has submitted this change and it was merged.

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


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
---
M channels/chan_dahdi.c
M channels/chan_skinny.c
M channels/sig_pri.c
3 files changed, 7 insertions(+), 2 deletions(-)

Approvals:
  Joshua Colp: Looks good to me, approved; Verified



diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index bcbcfa3..231a52f 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -18452,6 +18452,11 @@
 					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/chan_skinny.c b/channels/chan_skinny.c
index d9b2577..d401400 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -4374,7 +4374,7 @@
 
 	AST_LIST_TRAVERSE(ast_channel_varshead(ast), current, entries) {
 		if (!(strcasecmp(ast_var_name(current),"SKINNY_AUTOANSWER"))) {
-			if (d->hookstate == SKINNY_ONHOOK && sub->aa_sched < 0) {
+			if (d->hookstate == SKINNY_ONHOOK && !(sub->aa_sched < 0)) {
 				char buf[24];
 				int aatime;
 				char *stringp = buf, *curstr;
diff --git a/channels/sig_pri.c b/channels/sig_pri.c
index dce5fe0..efd960e 100644
--- a/channels/sig_pri.c
+++ b/channels/sig_pri.c
@@ -4517,7 +4517,7 @@
 					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);

-- 
To view, visit https://gerrit.asterisk.org/3271
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I818f149cd66a93b062df421e1c73c7942f5a4a77
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: certified/11.6
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>