<p>Sean Bright has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/17333">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">term.c: Truncate the message rather than the escape sequences.<br><br>Change-Id: Ie460acf577faeb4a6d74062e22ea9f3ffd3233de<br>---<br>M main/term.c<br>1 file changed, 22 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/33/17333/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/main/term.c b/main/term.c</span><br><span>index be10163..72fdb6c 100644</span><br><span>--- a/main/term.c</span><br><span>+++ b/main/term.c</span><br><span>@@ -43,6 +43,7 @@</span><br><span> static int vt100compat;</span><br><span> </span><br><span> static char enddata[80] = "";</span><br><span style="color: hsl(120, 100%, 40%);">+static int enddata_len = 0;</span><br><span> static char quitdata[80] = "";</span><br><span> </span><br><span> static const char * const termpath[] = {</span><br><span>@@ -221,11 +222,11 @@</span><br><span> if (vt100compat) {</span><br><span> /* Make commands show up in nice colors */</span><br><span> if (ast_opt_light_background) {</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(enddata, sizeof(enddata), "%c[%dm", ESC, COLOR_BLACK);</span><br><span style="color: hsl(120, 100%, 40%);">+ enddata_len = snprintf(enddata, sizeof(enddata), "%c[%dm", ESC, COLOR_BLACK);</span><br><span> } else if (ast_opt_force_black_background) {</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(enddata, sizeof(enddata), "%c[%d;%d;%dm", ESC, ATTR_RESET, COLOR_WHITE, COLOR_BLACK + 10);</span><br><span style="color: hsl(120, 100%, 40%);">+ enddata_len = snprintf(enddata, sizeof(enddata), "%c[%d;%d;%dm", ESC, ATTR_RESET, COLOR_WHITE, COLOR_BLACK + 10);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(enddata, sizeof(enddata), "%c[%dm", ESC, ATTR_RESET);</span><br><span style="color: hsl(120, 100%, 40%);">+ enddata_len = snprintf(enddata, sizeof(enddata), "%c[%dm", ESC, ATTR_RESET);</span><br><span> }</span><br><span> snprintf(quitdata, sizeof(quitdata), "%c[%dm", ESC, ATTR_RESET);</span><br><span> }</span><br><span>@@ -235,6 +236,7 @@</span><br><span> char *term_color(char *outbuf, const char *inbuf, int fgcolor, int bgcolor, int maxout)</span><br><span> {</span><br><span> int attr = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ int written = 0;</span><br><span> </span><br><span> if (!vt100compat) {</span><br><span> ast_copy_string(outbuf, inbuf, maxout);</span><br><span>@@ -262,10 +264,25 @@</span><br><span> if (!bgcolor) {</span><br><span> bgcolor = COLOR_BLACK;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(outbuf, maxout, "%c[%d;%d;%dm%s%s", ESC, attr, fgcolor, bgcolor + 10, inbuf, term_end());</span><br><span style="color: hsl(120, 100%, 40%);">+ written = snprintf(outbuf, maxout, "%c[%d;%d;%dm%s%s", ESC, attr, fgcolor, bgcolor + 10, inbuf, term_end());</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(outbuf, maxout, "%c[%d;%dm%s%s", ESC, attr, fgcolor, inbuf, term_end());</span><br><span style="color: hsl(120, 100%, 40%);">+ written = snprintf(outbuf, maxout, "%c[%d;%dm%s%s", ESC, attr, fgcolor, inbuf, term_end());</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (written >= maxout) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* We truncated so stamp out some trailing bytes with our enddata */</span><br><span style="color: hsl(120, 100%, 40%);">+ int offset = maxout - enddata_len - 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (offset < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If we get here, the passed buffer is comically undersized, so just</span><br><span style="color: hsl(120, 100%, 40%);">+ gracefully bail out */</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_copy_string(outbuf, inbuf, maxout);</span><br><span style="color: hsl(120, 100%, 40%);">+ return outbuf;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&outbuf[offset], enddata, enddata_len + 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return outbuf;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/17333">change 17333</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/+/17333"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ie460acf577faeb4a6d74062e22ea9f3ffd3233de </div>
<div style="display:none"> Gerrit-Change-Number: 17333 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Sean Bright <sean@seanbright.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>