Index: apps/app_meetme.c =================================================================== --- apps/app_meetme.c (revision 236303) +++ apps/app_meetme.c (working copy) @@ -319,6 +319,9 @@ #define MAX_CONFNUM 80 #define MAX_PIN 80 +/* Enough space for ",," followed by a 0 byte. */ +#define MAX_SETTINGS (MAX_CONFNUM + MAX_PIN + MAX_PIN + 3) + enum announcetypes { CONF_HASJOIN, CONF_HASLEFT @@ -2563,7 +2566,6 @@ struct ast_config *cfg; struct ast_variable *var; struct ast_conference *cnf; - char *parse; AST_DECLARE_APP_ARGS(args, AST_APP_ARG(confno); AST_APP_ARG(pin); @@ -2602,13 +2604,15 @@ ast_log(LOG_WARNING, "No %s file :(\n", CONFIG_FILE_NAME); return NULL; } + for (var = ast_variable_browse(cfg, "rooms"); var; var = var->next) { + char parse[MAX_SETTINGS]; + if (strcasecmp(var->name, "conf")) continue; - - if (!(parse = ast_strdupa(var->value))) - return NULL; - + + ast_copy_string(parse, var->value, sizeof(parse)); + AST_NONSTANDARD_APP_ARGS(args, parse, ','); if (!strcasecmp(args.confno, confno)) { /* Bingo it's a valid conference */ @@ -2774,33 +2778,32 @@ if (cfg) { var = ast_variable_browse(cfg, "rooms"); while (var) { + char parse[MAX_SETTINGS], *stringp = parse, *confno_tmp; if (!strcasecmp(var->name, "conf")) { - char *stringp = ast_strdupa(var->value); - if (stringp) { - char *confno_tmp = strsep(&stringp, "|,"); - int found = 0; - if (!dynamic) { - /* For static: run through the list and see if this conference is empty */ - AST_LIST_LOCK(&confs); - AST_LIST_TRAVERSE(&confs, cnf, list) { - if (!strcmp(confno_tmp, cnf->confno)) { - /* The conference exists, therefore it's not empty */ - found = 1; - break; - } + int found = 0; + ast_copy_string(parse, var->value, sizeof(parse)); + confno_tmp = strsep(&stringp, "|,"); + if (!dynamic) { + /* For static: run through the list and see if this conference is empty */ + AST_LIST_LOCK(&confs); + AST_LIST_TRAVERSE(&confs, cnf, list) { + if (!strcmp(confno_tmp, cnf->confno)) { + /* The conference exists, therefore it's not empty */ + found = 1; + break; } - AST_LIST_UNLOCK(&confs); - if (!found) { - /* At this point, we have a confno_tmp (static conference) that is empty */ - if ((empty_no_pin && ast_strlen_zero(stringp)) || (!empty_no_pin)) { - /* Case 1: empty_no_pin and pin is nonexistent (NULL) - * Case 2: empty_no_pin and pin is blank (but not NULL) - * Case 3: not empty_no_pin - */ - ast_copy_string(confno, confno_tmp, sizeof(confno)); - break; - /* XXX the map is not complete (but we do have a confno) */ - } + } + AST_LIST_UNLOCK(&confs); + if (!found) { + /* At this point, we have a confno_tmp (static conference) that is empty */ + if ((empty_no_pin && ast_strlen_zero(stringp)) || (!empty_no_pin)) { + /* Case 1: empty_no_pin and pin is nonexistent (NULL) + * Case 2: empty_no_pin and pin is blank (but not NULL) + * Case 3: not empty_no_pin + */ + ast_copy_string(confno, confno_tmp, sizeof(confno)); + break; + /* XXX the map is not complete (but we do have a confno) */ } } }