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

This update fixes the problem reported in bug 8551; that ast_app_getdata() behaves differently in trunk for the case of a null prompt.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48388 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Steve Murphy
2006-12-11 17:00:36 +00:00
parent 496d3e72f2
commit 2c332f0200
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main/app.c
View File

@@ -115,14 +115,16 @@ int ast_app_getdata(struct ast_channel *c, const char *prompt, char *s, int maxl
if (maxlen) if (maxlen)
s[0] = '\0'; s[0] = '\0';
if (ast_strlen_zero(prompt)) if (!prompt)
return -1; prompt="";
filename = ast_strdupa(prompt); filename = ast_strdupa(prompt);
while ((front = strsep(&filename, "&"))) { while ((front = strsep(&filename, "&"))) {
res = ast_streamfile(c, front, c->language); if (!ast_strlen_zero(front)) {
if (res) res = ast_streamfile(c, front, c->language);
continue; if (res)
continue;
}
if (ast_strlen_zero(filename)) { if (ast_strlen_zero(filename)) {
/* set timeouts for the last prompt */ /* set timeouts for the last prompt */
fto = c->pbx ? c->pbx->rtimeout * 1000 : 6000; fto = c->pbx ? c->pbx->rtimeout * 1000 : 6000;