<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][16882] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=16882">16882</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2010-03-03 12:31:19 -0600 (Wed, 03 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>skip dialplan args with bad char sequences</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_mprintfh">freeswitch/trunk/src/include/switch_mprintf.h</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_utilsh">freeswitch/trunk/src/include/switch_utils.h</a></li>
<li><a href="#freeswitchtrunksrcswitch_callerc">freeswitch/trunk/src/switch_caller.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_channelc">freeswitch/trunk/src/switch_channel.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_eventc">freeswitch/trunk/src/switch_event.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_mprintfc">freeswitch/trunk/src/switch_mprintf.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeswitch_mprintfh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_mprintf.h (16881 => 16882)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_mprintf.h 2010-03-03 17:43:28 UTC (rev 16881)
+++ freeswitch/trunk/src/include/switch_mprintf.h 2010-03-03 18:31:19 UTC (rev 16882)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx"> */
</span><span class="cx"> SWITCH_DECLARE(char *) switch_mprintf(const char *zFormat, ...);
</span><span class="cx"> SWITCH_DECLARE(char *) switch_vmprintf(const char *zFormat, va_list ap);
</span><ins>+SWITCH_DECLARE(char *) switch_snprintfv(char *zBuf, int n, const char *zFormat, ...);
</ins><span class="cx">
</span><span class="cx"> SWITCH_END_EXTERN_C
</span><span class="cx"> #endif /* SWITCH_MPRINTF_H */
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_utilsh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_utils.h (16881 => 16882)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_utils.h 2010-03-03 17:43:28 UTC (rev 16881)
+++ freeswitch/trunk/src/include/switch_utils.h 2010-03-03 18:31:19 UTC (rev 16882)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx">
</span><span class="cx"> while (i && *i == '\\') {
</span><span class="cx"> i++;
</span><del>- if (*i == '\\' || *i == 'n' || *i == 's' || *i == 't') {
</del><ins>+ if (*i == '\\' || *i == 'n' || *i == 's' || *i == 't' || *i == '\'') {
</ins><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="cx"> i = strchr(i, '\\');
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_callerc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_caller.c (16881 => 16882)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_caller.c 2010-03-03 17:43:28 UTC (rev 16881)
+++ freeswitch/trunk/src/switch_caller.c 2010-03-03 18:31:19 UTC (rev 16882)
</span><span class="lines">@@ -415,6 +415,13 @@
</span><span class="cx"> va_end(ap);
</span><span class="cx">
</span><span class="cx"> if (data) {
</span><ins>+ char *p;
+
+ if ((p = strstr(data, "\\'"))) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "App not added, Invalid character sequence in data string [%s]\n", data);
+ free(data);
+ return;
+ }
</ins><span class="cx"> switch_caller_extension_add_application(session, caller_extension, application_name, data);
</span><span class="cx"> free(data);
</span><span class="cx"> }
</span><span class="lines">@@ -426,12 +433,22 @@
</span><span class="cx"> const char *application_data)
</span><span class="cx"> {
</span><span class="cx"> switch_caller_application_t *caller_application = NULL;
</span><ins>+ char *p;
</ins><span class="cx">
</span><span class="cx"> switch_assert(session != NULL);
</span><span class="cx">
</span><span class="cx"> if ((caller_application = switch_core_session_alloc(session, sizeof(switch_caller_application_t))) != 0) {
</span><span class="cx"> caller_application->application_name = switch_core_session_strdup(session, application_name);
</span><span class="cx"> caller_application->application_data = switch_core_session_strdup(session, application_data);
</span><ins>+
+
+
+ if ((p = strstr(caller_application->application_data, "\\'"))) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "App not added, Invalid character sequence in data string [%s]\n",
+ caller_application->application_data);
+ return;
+ }
+
</ins><span class="cx"> if (!caller_extension->applications) {
</span><span class="cx"> caller_extension->applications = caller_application;
</span><span class="cx"> } else if (caller_extension->last_application) {
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_channelc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_channel.c (16881 => 16882)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_channel.c 2010-03-03 17:43:28 UTC (rev 16881)
+++ freeswitch/trunk/src/switch_channel.c 2010-03-03 18:31:19 UTC (rev 16882)
</span><span class="lines">@@ -2438,6 +2438,9 @@
</span><span class="cx"> if (*(p + 1) == '$') {
</span><span class="cx"> nv = 1;
</span><span class="cx"> p++;
</span><ins>+ } else if (*(p + 1) == '\'') {
+ p++;
+ continue;
</ins><span class="cx"> } else if (*(p + 1) == '\\') {
</span><span class="cx"> *c++ = *p++;
</span><span class="cx"> len++;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_eventc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_event.c (16881 => 16882)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_event.c 2010-03-03 17:43:28 UTC (rev 16881)
+++ freeswitch/trunk/src/switch_event.c 2010-03-03 18:31:19 UTC (rev 16882)
</span><span class="lines">@@ -1395,6 +1395,9 @@
</span><span class="cx"> if (*(p + 1) == '$') {
</span><span class="cx"> nv = 1;
</span><span class="cx"> p++;
</span><ins>+ } else if (*(p + 1) == '\'') {
+ p++;
+ continue;
</ins><span class="cx"> } else if (*(p + 1) == '\\') {
</span><span class="cx"> *c++ = *p++;
</span><span class="cx"> len++;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_mprintfc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_mprintf.c (16881 => 16882)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_mprintf.c 2010-03-03 17:43:28 UTC (rev 16881)
+++ freeswitch/trunk/src/switch_mprintf.c 2010-03-03 18:31:19 UTC (rev 16882)
</span><span class="lines">@@ -872,30 +872,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*
</span><del>-** Print into memory. Use the internal %-conversion extensions.
-*/
-SWITCH_DECLARE(char *) switch_vmprintf(const char *zFormat, va_list ap)
-{
- char zBase[SWITCH_PRINT_BUF_SIZE];
- return base_vprintf(printf_realloc, 1, zBase, sizeof(zBase), zFormat, ap);
-}
-
-/*
-** Print into memory. Use the internal %-conversion extensions.
-*/
-SWITCH_DECLARE(char *) switch_mprintf(const char *zFormat, ...)
-{
- va_list ap;
- char *z;
- char zBase[SWITCH_PRINT_BUF_SIZE];
- va_start(ap, zFormat);
- z = base_vprintf(printf_realloc, 1, zBase, sizeof(zBase), zFormat, ap);
- va_end(ap);
- return z;
-}
-
-#ifdef __UNUSED__
-/*
</del><span class="cx"> ** Print into memory. Omit the internal %-conversion extensions.
</span><span class="cx"> */
</span><span class="cx"> SWITCH_DECLARE(char *) switch_vmprintf(const char *zFormat, va_list ap)
</span><span class="lines">@@ -924,7 +900,7 @@
</span><span class="cx"> ** are not able to use a "," as the decimal point in place of "." as
</span><span class="cx"> ** specified by some locales.
</span><span class="cx"> */
</span><del>-SWITCH_DECLARE(char *) switch_snprintf(int n, char *zBuf, const char *zFormat, ...)
</del><ins>+SWITCH_DECLARE(char *) switch_snprintfv(char *zBuf, int n, const char *zFormat, ...)
</ins><span class="cx"> {
</span><span class="cx"> char *z;
</span><span class="cx"> va_list ap;
</span><span class="lines">@@ -934,4 +910,4 @@
</span><span class="cx"> va_end(ap);
</span><span class="cx"> return z;
</span><span class="cx"> }
</span><del>-#endif
</del><ins>+
</ins></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>