From b86c8803fe6204e3955d145143a1a70b4b6667ff Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Wed, 31 May 2017 09:25:02 +0000 Subject: [PATCH] channel / app_meetme: Fix parentheses. ASTERISK-27025 Change-Id: Id736b0aa4ec6b6b0f04663d64fa8d151f81fdbed --- apps/app_meetme.c | 2 +- main/channel.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 791f75eb0a..be45394880 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 0934d7925b..af491117b5 100644 --- a/main/channel.c +++ b/main/channel.c @@ -9232,7 +9232,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; } -- 2.47.2