kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-03 20:38:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 219987 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r219987 | tilghman | 2009-09-24 02:39:44 -0500 (Thu, 24 Sep 2009) | 8 lines
  
  Fix two possible crashes, one only in 1.6.1 and one in 1.6.1 forward.
  (closes issue #15739)
   Reported by: DLNoah, jeffg
   Patches: 
         20090914__issue15739.diff.txt uploaded by tilghman (license 14)
         20090922__issue15739.diff.txt uploaded by tilghman (license 14)
   Tested by: DLNoah, jeffg
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@219988 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-09-24 07:44:46 +00:00
parent 8f9094556e
commit f0d39f6478
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/app_directory.c
View File

@@ -473,6 +473,11 @@ static int search_directory(const char *context, struct ast_config *vmcfg, struc
strsep(&bufptr, ",");
pos = strsep(&bufptr, ",");
/* No name to compare against */
if (ast_strlen_zero(pos)) {
continue;
}
res = 0;
if (ast_test_flag(&flags, OPT_LISTBYLASTNAME)) {
res = check_match(&item, pos, v->name, ext, 0 /* use_first_name */);
@@ -645,7 +650,7 @@ static int directory_exec(struct ast_channel *chan, void *data)
int res = 0, digit = 3;
struct ast_config *cfg, *ucfg;
const char *dirintro;
char *parse, *opts[OPT_ARG_ARRAY_SIZE];
char *parse, *opts[OPT_ARG_ARRAY_SIZE] = { "", };
struct ast_flags flags = { 0 };
struct ast_flags config_flags = { 0 };
enum { FIRST, LAST, BOTH } which = LAST;