diff options
author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-23 21:07:45 +0000 |
---|---|---|
committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-23 21:07:45 +0000 |
commit | b6de80a0fa1f353ea5bf167414d5cda1495ad3ba (patch) | |
tree | 70eebfda1de0b3b18829fd5a02ed16c4dba28b9d | |
parent | 1edf6c8d579725fc5e2206f67e14f7f1f6549b4a (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@14515 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | apps/app_meetme.c | 2 | ||||
-rw-r--r-- | apps/app_readfile.c | 17 |
2 files changed, 11 insertions, 8 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index c66410339..9bfbc8892 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -737,6 +737,8 @@ static void conf_flush(int fd, struct ast_channel *chan) f = ast_read(chan); if (f) ast_frfree(f); + else /* channel was hung up or something else happened */ + break; } } diff --git a/apps/app_readfile.c b/apps/app_readfile.c index 3340964b7..bc418aaa1 100644 --- a/apps/app_readfile.c +++ b/apps/app_readfile.c @@ -95,15 +95,16 @@ static int readfile_exec(struct ast_channel *chan, void *data) } } - returnvar = ast_read_textfile(file); - if(len > 0){ - if(len < strlen(returnvar)) - returnvar[len]='\0'; - else - ast_log(LOG_WARNING,"%s is longer than %d, and %d \n", file, len, (int)strlen(returnvar)); + if ((returnvar = ast_read_textfile(file))) { + if (len > 0) { + if (len < strlen(returnvar)) + returnvar[len]='\0'; + else + ast_log(LOG_WARNING, "%s is longer than %d, and %d \n", file, len, (int)strlen(returnvar)); + } + pbx_builtin_setvar_helper(chan, varname, returnvar); + free(returnvar); } - pbx_builtin_setvar_helper(chan, varname, returnvar); - free(returnvar); LOCAL_USER_REMOVE(u); return res; } |