From: Joshua Colp <jcolp@digium.com>
Date: Wed, 31 May 2017 09:25:02 +0000 (+0000)
Subject: channel / app_meetme: Fix parentheses.
X-Git-Tag: 13.17.0-rc1~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc05183f4b7d728534ec6fa5f3fc21802396aabf;p=thirdparty%2Fasterisk.git

channel / app_meetme: Fix parentheses.

ASTERISK-27025

Change-Id: Id736b0aa4ec6b6b0f04663d64fa8d151f81fdbed
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 7903b1d5f1..2ad1920e82 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -4663,7 +4663,7 @@ static struct ast_conference *find_conf_realtime(struct ast_channel *chan, char
 	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 5aaeab9d29..f2d8697232 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -9192,7 +9192,7 @@ static int redirecting_reason_build_data(unsigned char *data, size_t datalen,
 
 	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;
 		}