diff options
| -rw-r--r-- | apps/app_meetme.c | 2 | ||||
| -rw-r--r-- | main/channel.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 36f5c7727..71ca9dc9f 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -4661,7 +4661,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 1f97e651c..4451e524f 100644 --- a/main/channel.c +++ b/main/channel.c @@ -9116,7 +9116,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; } |