<!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][14134] </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=14134">14134</a></dd>
<dt>Author</dt> <dd>ledr</dd>
<dt>Date</dt> <dd>2009-07-05 06:38:39 -0500 (Sun, 05 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>added loop count to xml_odbc_render_template to avoid infinite loops. set max to 32</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribmodxml_intmod_xml_odbcmod_xml_odbcc">freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribmodxml_intmod_xml_odbcmod_xml_odbcc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c (14133 => 14134)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c 2009-07-05 01:17:18 UTC (rev 14133)
+++ freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c 2009-07-05 11:38:39 UTC (rev 14134)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> switch_odbc_handle_t *master_odbc;
</span><span class="cx"> switch_bool_t debug;
</span><span class="cx"> switch_bool_t keep_files_around;
</span><ins>+ int max_render_template_count;
</ins><span class="cx"> } globals;
</span><span class="cx">
</span><span class="cx"> typedef struct xml_odbc_session_helper {
</span><span class="lines">@@ -66,6 +67,7 @@
</span><span class="cx"> switch_xml_t xml_out; /* root tag of xml that is rendered to */
</span><span class="cx"> switch_xml_t xml_out_cur; /* current tag in xml that is rendered to */
</span><span class="cx"> int xml_out_cur_off; /* depth counter of xml_out_cur */
</span><ins>+ int render_template_count; /* when this counter > globals.max_render_template_count then stop because there's probably a loop */
</ins><span class="cx"> int tmp_i; /* temporary counter, used for counting rows in the callback */
</span><span class="cx"> } xml_odbc_session_helper_t;
</span><span class="cx">
</span><span class="lines">@@ -312,6 +314,14 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "DEBUG GOING TO RENDER TEMPLATE [%s]\n", helper->next_template_name);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /* up the helper->render_template_count and check whether it's > globals.max_render_template_count */
+ helper->render_template_count++;
+ if (helper->render_template_count > globals.max_render_template_count) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
+ "Stopped rendering template, called xml_odbc_render_template more than [%i] times, probably looping.\n", globals.max_render_template_count);
+ goto done;
+ }
+
</ins><span class="cx"> /* free helper -> xml_out */
</span><span class="cx"> switch_xml_free(helper->xml_out);
</span><span class="cx">
</span><span class="lines">@@ -376,6 +386,9 @@
</span><span class="cx"> switch_core_new_memory_pool(&pool);
</span><span class="cx"> helper.pool = pool;
</span><span class="cx">
</span><ins>+ /* set the render_template_count to 0 */
+ helper.render_template_count = 0;
+
</ins><span class="cx"> /* set the default template to render */
</span><span class="cx"> helper.next_template_name = "default";
</span><span class="cx">
</span><span class="lines">@@ -494,6 +507,9 @@
</span><span class="cx"> // is this allowed ? or should I copy the entire tree ? can I register a callback function that is called when reloadxml is done ?
</span><span class="cx"> globals.templates_tag = templates_tag;
</span><span class="cx">
</span><ins>+ /* set a default globals.max_render_template_count to avoid loops in render_template */
+ globals.max_render_template_count = 32;
+
</ins><span class="cx"> /* get all the settings */
</span><span class="cx"> for (param = switch_xml_child(settings_tag, "param"); param; param = param->next) {
</span><span class="cx"> char *var = NULL;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>