kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a crash happening in app_directory. This crash would occur if a users.conf existed.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114832 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2008-04-29 17:31:26 +00:00
parent 1ba4d31854
commit 1016811538
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/app_directory.c
View File

@@ -625,7 +625,6 @@ static int search_directory(const char *context, struct ast_config *vmcfg, struc
AST_LIST_INSERT_TAIL(alist, item, entry);
}
if (ucfg) {
for (cat = ast_category_browse(ucfg, NULL); cat ; cat = ast_category_browse(ucfg, cat)) {
const char *pos;
@@ -641,10 +640,10 @@ static int search_directory(const char *context, struct ast_config *vmcfg, struc
res = 0;
if (ast_test_flag(&flags, OPT_LISTBYLASTNAME)) {
res = check_match(&item, pos, v->name, ext, 0 /* use_first_name */);
res = check_match(&item, pos, cat, ext, 0 /* use_first_name */);
}
if (!res && ast_test_flag(&flags, OPT_LISTBYFIRSTNAME)) {
res = check_match(&item, pos, v->name, ext, 1 /* use_first_name */);
res = check_match(&item, pos, cat, ext, 1 /* use_first_name */);
}
if (!res)
@@ -655,7 +654,6 @@ static int search_directory(const char *context, struct ast_config *vmcfg, struc
AST_LIST_INSERT_TAIL(alist, item, entry);
}
}
return 0;
}