This update fixes the problem reported in bug 8551; that ast_app_getdata() behaves...

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48388 65c4cc65-6c06-0410-ace0-fbb531ad65f3

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