diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_confbridge.c | 17 | ||||
| -rw-r--r-- | apps/confbridge/include/confbridge.h | 2 |
2 files changed, 13 insertions, 6 deletions
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c index bf8773d32..fee8643bb 100644 --- a/apps/app_confbridge.c +++ b/apps/app_confbridge.c @@ -1593,17 +1593,24 @@ static int confbridge_exec(struct ast_channel *chan, const char *data) goto confbridge_cleanup; } - if (ast_strlen_zero(data)) { + /* We need to make a copy of the input string if we are going to modify it! */ + parse = ast_strdupa(data); + + AST_STANDARD_APP_ARGS(args, parse); + + if (ast_strlen_zero(args.conf_name)) { pbx_builtin_setvar_helper(chan, "CONFBRIDGE_RESULT", "FAILED"); ast_log(LOG_WARNING, "%s requires an argument (conference name[,options])\n", app); res = -1; goto confbridge_cleanup; } - /* We need to make a copy of the input string if we are going to modify it! */ - parse = ast_strdupa(data); - - AST_STANDARD_APP_ARGS(args, parse); + if (strlen(args.conf_name) >= MAX_CONF_NAME) { + pbx_builtin_setvar_helper(chan, "CONFBRIDGE_RESULT", "FAILED"); + ast_log(LOG_WARNING, "%s does not accept conference names longer than %d\n", app, MAX_CONF_NAME - 1); + res = -1; + goto confbridge_cleanup; + } /* bridge profile name */ if (args.argc > 1 && !ast_strlen_zero(args.b_profile_name)) { diff --git a/apps/confbridge/include/confbridge.h b/apps/confbridge/include/confbridge.h index ce6253744..4e155e621 100644 --- a/apps/confbridge/include/confbridge.h +++ b/apps/confbridge/include/confbridge.h @@ -31,7 +31,7 @@ #include "conf_state.h" /* Maximum length of a conference bridge name */ -#define MAX_CONF_NAME 32 +#define MAX_CONF_NAME AST_MAX_EXTENSION /* Maximum length of a conference pin */ #define MAX_PIN 80 |