[svn-commits] jrose: trunk r418654 - in /trunk: ./ funcs/func_uri.c

[SVN commits to the Digium repositories]

Author: jrose
Date: Tue Jul 15 12:57:17 2014
New Revision: 418654

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418654
Log:
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
........

Merged revisions 418649 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 418650 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/funcs/func_uri.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/funcs/func_uri.c
URL: http://svnview.digium.com/svn/asterisk/trunk/funcs/func_uri.c?view=diff&rev=418654&r1=418653&r2=418654
==============================================================================
--- trunk/funcs/func_uri.c (original)
+++ trunk/funcs/func_uri.c Tue Jul 15 12:57:17 2014
@@ -76,8 +76,8 @@
 		     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 @@
 		     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);