From 3d419e87965659da4dfdef2566893255b5c6985f Mon Sep 17 00:00:00 2001
From: Jonathan Rose <jrose@digium.com>
Date: Tue, 15 Jul 2014 17:32:15 +0000
Subject: [PATCH] func_uri: URIENCODE/URIDECODE - allow empty strings as
argument
Previously these two dialplan functions would issue warnings and
return failure when an empty string is used as the argument. Now
they will not issue a warning and will successfully return an
empty string.
ASTERISK-23911 #close
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/3745/
........
Merged revisions 418641 from http://svn.asterisk.org/svn/asterisk/branches/1.8
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@418649 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
funcs/func_uri.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/funcs/func_uri.c b/funcs/func_uri.c
index f4ecf3d67b..f53b75fa34 100644
--- a/funcs/func_uri.c
+++ b/funcs/func_uri.c
@@ -76,8 +76,8 @@ static int uriencode(struct ast_channel *chan, const char *cmd, char *data,
char *buf, size_t len)
{
if (ast_strlen_zero(data)) {
- ast_log(LOG_WARNING, "Syntax: URIENCODE(<data>) - missing argument!\n");
- return -1;
+ buf[0] = '\0';
+ return 0;
}
ast_uri_encode(data, buf, len, ast_uri_http);
@@ -90,8 +90,8 @@ static int uridecode(struct ast_channel *chan, const char *cmd, char *data,
char *buf, size_t len)
{
if (ast_strlen_zero(data)) {
- ast_log(LOG_WARNING, "Syntax: URIDECODE(<data>) - missing argument!\n");
- return -1;
+ buf[0] = '\0';
+ return 0;
}
ast_copy_string(buf, data, len);
--
GitLab