channel / app_meetme: Fix parentheses.
authorJoshua Colp <jcolp@digium.com>
Wed, 31 May 2017 09:25:02 +0000 (09:25 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 31 May 2017 14:00:09 +0000 (09:00 -0500)
ASTERISK-27025

Change-Id: Id736b0aa4ec6b6b0f04663d64fa8d151f81fdbed

apps/app_meetme.c
main/channel.c

index 36f5c77..71ca9dc 100644 (file)
@@ -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);
                }
index 1f97e65..4451e52 100644 (file)
@@ -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;
                }