<p>Sean Bright has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/14736">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bridge_channel: Ensure text messages are zero terminated<br><br>T.140 data in RTP is not zero terminated, so when we are queuing a text<br>frame on a bridge we need to ensure that we are passing a zero<br>terminated string.<br><br>ASTERISK-28974 #close<br><br>Change-Id: Ic10057387ce30b2094613ea67e3ae8c5c431dda3<br>---<br>M main/bridge_channel.c<br>1 file changed, 13 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/36/14736/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/main/bridge_channel.c b/main/bridge_channel.c</span><br><span>index 1a7df87..8144e32 100644</span><br><span>--- a/main/bridge_channel.c</span><br><span>+++ b/main/bridge_channel.c</span><br><span>@@ -2362,9 +2362,19 @@</span><br><span>  case AST_FRAME_NULL:</span><br><span>                 break;</span><br><span>       case AST_FRAME_TEXT:</span><br><span style="color: hsl(0, 100%, 40%);">-            ast_debug(1, "Sending TEXT frame to '%s': %*.s\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                    ast_channel_name(bridge_channel->chan), fr->datalen, (char *)fr->data.ptr);</span><br><span style="color: hsl(0, 100%, 40%);">-            ast_sendtext(bridge_channel->chan, fr->data.ptr);</span><br><span style="color: hsl(120, 100%, 40%);">+               {</span><br><span style="color: hsl(120, 100%, 40%);">+                     char *txt;</span><br><span style="color: hsl(120, 100%, 40%);">+                    ast_debug(1, "Sending TEXT frame to '%s': %*.s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                          ast_channel_name(bridge_channel->chan),</span><br><span style="color: hsl(120, 100%, 40%);">+                            fr->datalen, (char *) fr->data.ptr);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+                  /* Make sure to zero terminate the text data we are trying to send */</span><br><span style="color: hsl(120, 100%, 40%);">+                 txt = ast_strndup(fr->data.ptr, fr->datalen);</span><br><span style="color: hsl(120, 100%, 40%);">+                   if (txt) {</span><br><span style="color: hsl(120, 100%, 40%);">+                            ast_sendtext(bridge_channel->chan, txt);</span><br><span style="color: hsl(120, 100%, 40%);">+                           ast_free(txt);</span><br><span style="color: hsl(120, 100%, 40%);">+                        }</span><br><span style="color: hsl(120, 100%, 40%);">+             }</span><br><span>            break;</span><br><span>       case AST_FRAME_TEXT_DATA:</span><br><span>            msg = (struct ast_msg_data *)fr->data.ptr;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/14736">change 14736</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/14736"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-Change-Id: Ic10057387ce30b2094613ea67e3ae8c5c431dda3 </div>
<div style="display:none"> Gerrit-Change-Number: 14736 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Sean Bright <sean.bright@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>