From 39bee0fb7eb091e0ec725920aa015440a4985f75 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Tue, 21 Jul 2009 22:49:00 +0000 Subject: [PATCH] Merged revisions 207946 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r207946 | tilghman | 2009-07-21 17:45:32 -0500 (Tue, 21 Jul 2009) | 15 lines Merged revisions 207945 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r207945 | tilghman | 2009-07-21 17:38:54 -0500 (Tue, 21 Jul 2009) | 8 lines Force an error if a blank is passed to QUOTE (because the documentation states the argument is not optional). This change makes URIENCODE and QUOTE behave similarly, since the documentation states that the argument is not optional, for both. (closes issue #15439) Reported by: pkempgen Patches: 20090706__issue15439.diff.txt uploaded by tilghman (license 14) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@207949 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- funcs/func_strings.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/funcs/func_strings.c b/funcs/func_strings.c index e84629c387..db1e8af2f6 100644 --- a/funcs/func_strings.c +++ b/funcs/func_strings.c @@ -718,6 +718,12 @@ static struct ast_custom_function array_function = { static int quote(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len) { char *bufptr = buf, *dataptr = data; + if (ast_strlen_zero(data)) { + ast_log(LOG_WARNING, "No argument specified!\n"); + ast_copy_string(buf, "\"\"", len); + return 0; + } + *bufptr++ = '"'; for (; bufptr < buf + len - 1; dataptr++) { if (*dataptr == '\\') {