iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix printing invalid utf8 from /exec output

Browse Source 
This could possibly cause a crash.

On a related note exec_data() and exec_handle_colors() could probably
use a pass cleaning up to ensure they "do the right thing".
This commit is contained in:
Patrick Griffis 2016-12-04 04:39:06 -05:00
parent f2d93f5abe
commit b6426a1e9f
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/common/outbound.c
View File

@ -1717,6 +1717,24 @@ memrchr (const void *block, int c, size_t size)
} }
#endif #endif
static void
exec_print_line (session *sess, char *data, gssize len, gboolean tochannel)
{
exec_handle_colors (data, len);
char *valid = text_fixup_invalid_utf8 (data, len, NULL);
if (tochannel)
{
/* must turn off auto-completion temporarily */
const unsigned int old = prefs.hex_completion_auto;
prefs.hex_completion_auto = 0;
handle_multiline (sess, valid, FALSE, TRUE);
prefs.hex_completion_auto = old;
}
else
PrintText (sess, valid);
g_free (valid);
}
static gboolean static gboolean
exec_data (GIOChannel *source, GIOCondition condition, struct nbexec *s) exec_data (GIOChannel *source, GIOCondition condition, struct nbexec *s)
{ {
@ -1743,17 +1761,7 @@ exec_data (GIOChannel *source, GIOCondition condition, struct nbexec *s)
kill(s->childpid, SIGKILL); kill(s->childpid, SIGKILL);
if (len) { if (len) {
buf[len] = '\0'; buf[len] = '\0';
exec_handle_colors(buf, len); exec_print_line(s->sess, buf, len, s->tochannel);
if (s->tochannel)
{
/* must turn off auto-completion temporarily */
unsigned int old = prefs.hex_completion_auto;
prefs.hex_completion_auto = 0;
handle_multiline (s->sess, buf, FALSE, TRUE);
prefs.hex_completion_auto = old;
}
else
PrintText (s->sess, buf);
} }
g_free(buf); g_free(buf);
waitpid (s->childpid, NULL, 0); waitpid (s->childpid, NULL, 0);
@ -1782,11 +1790,7 @@ exec_data (GIOChannel *source, GIOCondition condition, struct nbexec *s)
s->buffill = 0; s->buffill = 0;
if (len) { if (len) {
exec_handle_colors (buf, len); exec_print_line(s->sess, buf, len, s->tochannel);
if (s->tochannel)
handle_multiline (s->sess, buf, FALSE, TRUE);
else
PrintText (s->sess, buf);
} }
g_free (buf); g_free (buf);