<!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][14127] </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=14127">14127</a></dd>
<dt>Author</dt> <dd>ledr</dd>
<dt>Date</dt> <dd>2009-07-03 13:47:19 -0500 (Fri, 03 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>oooh yeah, got rid of all 'definitely' memory leaks according to vg :-) only a few left during configuration !</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 (14126 => 14127)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c 2009-07-03 17:16:00 UTC (rev 14126)
+++ freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c 2009-07-03 18:47:19 UTC (rev 14127)
</span><span class="lines">@@ -196,13 +196,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!switch_strlen_zero(empty_result_break_to) && helper->tmp_i == 0) {
</span><del>-switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "HIEIEIEIEIEIEIEIEIEIEIEIEIEIEIEIEIEIEIEIEIEIEIEIRRRRRR [%s]\n", empty_result_break_to);
</del><span class="cx"> helper->next_template_name = empty_result_break_to;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> status = SWITCH_STATUS_SUCCESS;
</span><span class="cx">
</span><span class="cx"> done:
</span><ins>+
+ if (new_value != value) {
+ switch_safe_free(new_value);
+ }
+
</ins><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -250,13 +254,14 @@
</span><span class="cx">
</span><span class="cx"> /* copy all attrs */
</span><span class="cx"> for (i=0; helper->xml_in_cur->attr[i]; i+=2) {
</span><del>- char *tmp_attr;
- tmp_attr = switch_event_expand_headers(helper->event, helper->xml_in_cur->attr[i+1]); // LEAK !!!!
- switch_xml_set_attr(helper->xml_out_cur, helper->xml_in_cur->attr[i], tmp_attr);
</del><ins>+ char *tmp_attr, *tmp_attr2;
+ tmp_attr = switch_event_expand_headers(helper->event, helper->xml_in_cur->attr[i+1]);
+ tmp_attr2 = switch_core_strdup(helper->pool, tmp_attr); // BAH Can't I use a switch_event_expand_headers that uses helper->pool ?
+ switch_xml_set_attr(helper->xml_out_cur, helper->xml_in_cur->attr[i], tmp_attr2);
</ins><span class="cx">
</span><del>- // if (tmp_attr != helper->xml_in->attr[i+1]) {
- // switch_safe_free(tmp_attr);
- // }
</del><ins>+ if (tmp_attr != helper->xml_in_cur->attr[i+1]) {
+ switch_safe_free(tmp_attr);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* render all children */
</span><span class="lines">@@ -266,6 +271,12 @@
</span><span class="cx"> if (xml_odbc_render_tag(helper) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><ins>+
+ if (!switch_strlen_zero(helper->next_template_name)) {
+ status = SWITCH_STATUS_SUCCESS;
+ goto done;
+ }
+
</ins><span class="cx"> helper->xml_out_cur = xml_out_tmp;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -279,11 +290,8 @@
</span><span class="cx"> {
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_FALSE;
</span><span class="cx">
</span><del>- /* free helper -> xml_out, xml_out_cur, xml_in and xml_in_cur */
</del><ins>+ /* free helper -> xml_out */
</ins><span class="cx"> switch_xml_free(helper->xml_out);
</span><del>- switch_xml_free(helper->xml_out_cur);
- switch_xml_free(helper->xml_in);
- switch_xml_free(helper->xml_in_cur);
</del><span class="cx">
</span><span class="cx"> /* init helper-> xml_out and xml_out_cur */
</span><span class="cx"> if (!(helper->xml_out = helper->xml_out_cur = switch_xml_new(""))) {
</span><span class="lines">@@ -403,6 +411,7 @@
</span><span class="cx"> /* open (temporary) file */
</span><span class="cx"> if ((fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR| S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)) < 0) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening temp file [%s]!\n", filename);
</span><ins>+ switch_safe_free(xml_char);
</ins><span class="cx"> goto cleanup;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -410,6 +419,7 @@
</span><span class="cx"> if (!write(fd, xml_char, (unsigned) strlen(xml_char))) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error writing generated XML to temp file [%s]!\n", filename);
</span><span class="cx"> close(fd);
</span><ins>+ switch_safe_free(xml_char);
</ins><span class="cx"> goto cleanup;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -417,6 +427,9 @@
</span><span class="cx"> close(fd);
</span><span class="cx"> fd = -1;
</span><span class="cx">
</span><ins>+ /* free xml_char */
+ switch_safe_free(xml_char);
+
</ins><span class="cx"> /* copy the (temporary) file to switch_xml_t xml_out - this should never go wrong */
</span><span class="cx"> if (!(xml_out = switch_xml_parse_file(filename))) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Parsing Result!\n");
</span><span class="lines">@@ -432,8 +445,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> cleanup:
</span><ins>+ switch_xml_free(helper.xml_out);
</ins><span class="cx"> switch_core_destroy_memory_pool(&pool);
</span><del>- /* free *xml_char */
</del><span class="cx"> /* free helper ?? */
</span><span class="cx"> /* free filename */
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>