Fix both app_read and underlying read issue (bug #2352)

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

diff --git a/app.c b/app.c
index 86ad5077cabeef47815961ca0712956e48370a75..401b4451ad844d4701cb917ec35feecc832e14fd 100755 (executable)
--- a/app.c
+++ b/app.c
@@ -37,6 +37,8 @@ int ast_app_getdata(struct ast_channel *c, char *prompt, char *s, int maxlen, in
 {
        int res,to,fto;
        /* XXX Merge with full version? XXX */
+       if (maxlen)
+               s[0] = '\0';
        if (prompt) {
                res = ast_streamfile(c, prompt, c->language);
                if (res < 0)

diff --git a/apps/app_read.c b/apps/app_read.c
index 103e8571050ab9992c471dd06d196e1a34489966..988ef8009e54b32bbc1312eca09416c5d9e6a7fb 100755 (executable)
--- a/apps/app_read.c
+++ b/apps/app_read.c
@@ -103,9 +103,12 @@ static int read_exec(struct ast_channel *chan, void *data)
        if (!res) {
                ast_stopstream(chan);
                res = ast_app_getdata(chan, filename, tmp, maxdigits, 0);
-               if (res > -1)
+               if (res > -1) {
                        pbx_builtin_setvar_helper(chan, varname, tmp);
-               ast_verbose(VERBOSE_PREFIX_3 "User entered '%s'\n", tmp);
+                       ast_verbose(VERBOSE_PREFIX_3 "User entered '%s'\n", tmp);
+               } else {
+                       ast_verbose(VERBOSE_PREFIX_3 "User entered nothing\n");
+               }
        }
        LOCAL_USER_REMOVE(u);
        return res;