aboutsummaryrefslogtreecommitdiffstats
path: root/funcs/func_strings.c
diff options
context:
space:
mode:
authormnick <mnick@f38db490-d61c-443f-a65b-d21fe96a405b>2009-09-30 19:42:36 +0000
committermnick <mnick@f38db490-d61c-443f-a65b-d21fe96a405b>2009-09-30 19:42:36 +0000
commitcba2c67301a7a4f701965ebbe96713039b2df126 (patch)
tree4bbb58260a9dbde61125f1be7c32f28250a36c85 /funcs/func_strings.c
parentaaac5033225021b3f9269392df9690d2f3fd0f8c (diff)
Merged revisions 221153,221157,221303 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r221153 | mnick | 2009-09-30 10:37:39 -0500 (Wed, 30 Sep 2009) | 2 lines check bounds - prevents for buffer overflow ........ r221157 | mnick | 2009-09-30 10:41:46 -0500 (Wed, 30 Sep 2009) | 8 lines added a new dialplan function 'CSV_QUOTE' and changed the cdr_custom.sample.conf (closes issue #15471) Reported by: dkerr Patches: csv_quote_14.txt uploaded by mnick (license ) Tested by: mnick ........ r221303 | mnick | 2009-09-30 14:02:00 -0500 (Wed, 30 Sep 2009) | 2 lines changed the prototype definition of csv_quote ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@221368 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs/func_strings.c')
-rw-r--r--funcs/func_strings.c59
1 files changed, 56 insertions, 3 deletions
diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index 9fc8577f6..86336002f 100644
--- a/funcs/func_strings.c
+++ b/funcs/func_strings.c
@@ -276,6 +276,17 @@ AST_THREADSTORAGE(result_buf);
<para>Example: ${QUOTE(ab"c"de)} will return "abcde"</para>
</description>
</function>
+ <function name="CSV_QUOTE" language="en_US">
+ <synopsis>
+ Quotes a given string for use in a CSV file, escaping embedded quotes as necessary
+ </synopsis>
+ <syntax>
+ <parameter name="string" required="true" />
+ </syntax>
+ <description>
+ <para>Example: ${CSV_QUOTE("a,b" 123)} will return """a,b"" 123"</para>
+ </description>
+ </function>
<function name="SHIFT" language="en_US">
<synopsis>
Removes and returns the first item off of a variable containing delimited text
@@ -862,6 +873,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 (len < 3){ /* at least two for quotes and one for binary zero */
+ ast_log(LOG_ERROR, "Not enough buffer");
+ return -1;
+ }
+
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "No argument specified!\n");
ast_copy_string(buf, "\"\"", len);
@@ -869,7 +886,7 @@ static int quote(struct ast_channel *chan, const char *cmd, char *data, char *bu
}
*bufptr++ = '"';
- for (; bufptr < buf + len - 1; dataptr++) {
+ for (; bufptr < buf + len - 3; dataptr++) {
if (*dataptr == '\\') {
*bufptr++ = '\\';
*bufptr++ = '\\';
@@ -892,9 +909,43 @@ static struct ast_custom_function quote_function = {
.read = quote,
};
+static int csv_quote(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len)
+{
+ char *bufptr = buf, *dataptr = data;
+
+ if (len < 3){ /* at least two for quotes and one for binary zero */
+ ast_log(LOG_ERROR, "Not enough buffer");
+ return -1;
+ }
+
+ 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 - 3; dataptr++){
+ if (*dataptr == '"') {
+ *bufptr++ = '"';
+ *bufptr++ = '"';
+ } else if (*dataptr == '\0') {
+ break;
+ } else {
+ *bufptr++ = *dataptr;
+ }
+ }
+ *bufptr++ = '"';
+ *bufptr='\0';
+ return 0;
+}
+
+static struct ast_custom_function csv_quote_function = {
+ .name = "CSV_QUOTE",
+ .read = csv_quote,
+};
-static int len(struct ast_channel *chan, const char *cmd, char *data, char *buf,
- size_t buflen)
+static int len(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t buflen)
{
int length = 0;
@@ -1262,6 +1313,7 @@ static int unload_module(void)
res |= ast_custom_function_unregister(&regex_function);
res |= ast_custom_function_unregister(&array_function);
res |= ast_custom_function_unregister(&quote_function);
+ res |= ast_custom_function_unregister(&csv_quote_function);
res |= ast_custom_function_unregister(&len_function);
res |= ast_custom_function_unregister(&strftime_function);
res |= ast_custom_function_unregister(&strptime_function);
@@ -1290,6 +1342,7 @@ static int load_module(void)
res |= ast_custom_function_register(&regex_function);
res |= ast_custom_function_register(&array_function);
res |= ast_custom_function_register(&quote_function);
+ res |= ast_custom_function_register(&csv_quote_function);
res |= ast_custom_function_register(&len_function);
res |= ast_custom_function_register(&strftime_function);
res |= ast_custom_function_register(&strptime_function);