<!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][14933] </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=14933">14933</a></dd>
<dt>Author</dt> <dd>sathieu</dd>
<dt>Date</dt> <dd>2009-09-21 09:11:08 -0500 (Mon, 21 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>mod_tts_commandline: various memory fixes, corrected indentation</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodasr_ttsmod_tts_commandlinemod_tts_commandlinec">freeswitch/trunk/src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodasr_ttsmod_tts_commandlinemod_tts_commandlinec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c (14932 => 14933)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c 2009-09-21 09:43:47 UTC (rev 14932)
+++ freeswitch/trunk/src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c 2009-09-21 14:11:08 UTC (rev 14933)
</span><span class="lines">@@ -47,10 +47,10 @@
</span><span class="cx"> SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_command, globals.command);
</span><span class="cx">
</span><span class="cx"> struct tts_commandline_data {
</span><del>- switch_file_handle_t fh;
</del><span class="cx"> char *voice_name;
</span><span class="cx"> int rate;
</span><span class="cx"> char *file;
</span><ins>+ switch_file_handle_t *fh;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef struct tts_commandline_data tts_commandline_t;
</span><span class="lines">@@ -68,9 +68,9 @@
</span><span class="cx"> switch_assert(dest);
</span><span class="cx">
</span><span class="cx"> #ifdef WIN32
</span><del>- dest[n++] = '"';
</del><ins>+ dest[n++] = '"';
</ins><span class="cx"> #else
</span><del>- dest[n++] = '\'';
</del><ins>+ dest[n++] = '\'';
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> for (i = 0; i < string_len; i++) {
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> break;
</span><span class="cx"> #else
</span><span class="cx"> case '\'':
</span><del>- /* We replace ' by '\'' */
</del><ins>+ /* We replace ' by '\'' */
</ins><span class="cx"> dest_len+=3;
</span><span class="cx"> tmp = (char *) realloc(dest, sizeof(char) * (dest_len));
</span><span class="cx"> switch_assert(tmp);
</span><span class="lines">@@ -98,17 +98,17 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-dest_len++;
-tmp = (char *) realloc(dest, sizeof(char) * (dest_len));
-switch_assert(tmp);
-dest = tmp;
</del><ins>+ dest_len += 2; /* +2 for the closing quote and the null character */
+ tmp = (char *) realloc(dest, sizeof(char) * (dest_len));
+ switch_assert(tmp);
+ dest = tmp;
</ins><span class="cx"> #ifdef WIN32
</span><del>- dest[n++] = '"';
</del><ins>+ dest[n++] = '"';
</ins><span class="cx"> #else
</span><del>- dest[n++] = '\'';
</del><ins>+ dest[n++] = '\'';
</ins><span class="cx"> #endif
</span><del>-
- dest[dest_len] = 0;
</del><ins>+ dest[n++] = 0;
+ switch_assert(n == dest_len);
</ins><span class="cx"> return dest;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_strlen_zero(globals.command)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No command set, please edit %s\n", cf);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No command set, please edit %s\n", cf);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -160,12 +160,14 @@
</span><span class="cx"> info->voice_name = switch_core_strdup(sh->memory_pool, voice_name);
</span><span class="cx"> info->rate = rate;
</span><span class="cx">
</span><ins>+ /* Construct temporary file name with a new UUID */
</ins><span class="cx"> switch_uuid_get(&uuid);
</span><span class="cx"> switch_uuid_format(uuid_str, &uuid);
</span><del>-
</del><span class="cx"> switch_snprintf(outfile, sizeof(outfile), "%s%s.tmp.wav", SWITCH_GLOBAL_dirs.temp_dir, uuid_str);
</span><del>- info->file = outfile;
</del><ins>+ info->file = switch_core_strdup(sh->memory_pool, outfile);
</ins><span class="cx">
</span><ins>+ info->fh = (switch_file_handle_t *) switch_core_alloc(sh->memory_pool, sizeof(switch_file_handle_t));
+
</ins><span class="cx"> sh->private_info = info;
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -207,11 +209,11 @@
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (switch_core_file_open(&info->fh,
- info->file,
- 0, //number_of_channels,
- 0, //samples_per_second,
- SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (switch_core_file_open(info->fh,
+ info->file,
+ 0, //number_of_channels,
+ 0, //samples_per_second,
+ SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to open file: %s\n", info->file);
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="lines">@@ -228,15 +230,15 @@
</span><span class="cx">
</span><span class="cx"> size_t my_datalen = *datalen / 2;
</span><span class="cx">
</span><del>- if (switch_core_file_read(&info->fh, data, &my_datalen) != SWITCH_STATUS_SUCCESS) {
- *datalen = my_datalen * 2;
- return SWITCH_STATUS_FALSE;
</del><ins>+ if (switch_core_file_read(info->fh, data, &my_datalen) != SWITCH_STATUS_SUCCESS) {
+ *datalen = my_datalen * 2;
+ return SWITCH_STATUS_FALSE;
</ins><span class="cx"> }
</span><span class="cx"> *datalen = my_datalen * 2;
</span><span class="cx"> if(datalen == 0) {
</span><del>- return SWITCH_STATUS_BREAK;
</del><ins>+ return SWITCH_STATUS_BREAK;
</ins><span class="cx"> } else {
</span><del>- return SWITCH_STATUS_SUCCESS;
</del><ins>+ return SWITCH_STATUS_SUCCESS;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -245,9 +247,9 @@
</span><span class="cx"> tts_commandline_t *info = (tts_commandline_t *) sh->private_info;
</span><span class="cx"> assert(info != NULL);
</span><span class="cx">
</span><del>- switch_core_file_close(&info->fh);
</del><ins>+ switch_core_file_close(info->fh);
</ins><span class="cx"> if (unlink(info->file) != 0) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Sound file [%s] delete failed\n", info->file);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Sound file [%s] delete failed\n", info->file);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -257,7 +259,7 @@
</span><span class="cx"> assert(info != NULL);
</span><span class="cx">
</span><span class="cx"> if (!strcasecmp(param, "voice")) {
</span><del>- info->voice_name = switch_core_strdup(sh->memory_pool, val);
</del><ins>+ info->voice_name = switch_core_strdup(sh->memory_pool, val);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>