[asterisk-commits] channel / app meetme: Fix parentheses. (asterisk[14])

[SVN commits to the Asterisk project]

Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/5743 )

Change subject: channel / app_meetme: Fix parentheses.
......................................................................


channel / app_meetme: Fix parentheses.

ASTERISK-27025

Change-Id: Id736b0aa4ec6b6b0f04663d64fa8d151f81fdbed
---
M apps/app_meetme.c
M main/channel.c
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Richard Mudgett: Looks good to me, but someone else must approve
  Jenkins2: Approved for Submit
  Sean Bright: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved



diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 791f75e..be45394 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -4663,7 +4663,7 @@
 	if (cnf) {
 		if (confflags->flags && !cnf->chan &&
 		    !ast_test_flag64(confflags, CONFFLAG_QUIET) &&
-		    ast_test_flag64(confflags, CONFFLAG_INTROUSER | CONFFLAG_INTROUSERNOREVIEW) | CONFFLAG_INTROUSER_VMREC) {
+		    ast_test_flag64(confflags, CONFFLAG_INTROUSER | CONFFLAG_INTROUSERNOREVIEW | CONFFLAG_INTROUSER_VMREC)) {
 			ast_log(LOG_WARNING, "No DAHDI channel available for conference, user introduction disabled (is chan_dahdi loaded?)\n");
 			ast_clear_flag64(confflags, CONFFLAG_INTROUSER | CONFFLAG_INTROUSERNOREVIEW | CONFFLAG_INTROUSER_VMREC);
 		}
diff --git a/main/channel.c b/main/channel.c
index 0934d79..af49111 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -9232,7 +9232,7 @@
 
 	if (reason->str) {
 		length = strlen(reason->str);
-		if (datalen < pos + sizeof(data[0] * 2) + length) {
+		if (datalen < pos + (sizeof(data[0]) * 2) + length) {
 			ast_log(LOG_WARNING, "No space left for %s string\n", label);
 			return -1;
 		}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id736b0aa4ec6b6b0f04663d64fa8d151f81fdbed
Gerrit-PatchSet: 2
Gerrit-Project: asterisk
Gerrit-Branch: 14
Gerrit-Owner: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
Gerrit-Reviewer: Sean Bright <sean.bright at gmail.com>