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

xtext: Fix accidental truncation

Browse Source 
Fixes #2121
This commit is contained in:
Patrick Griffis 2018-02-11 17:24:32 -05:00
parent d3f1ab7813
commit 7510ab36b7
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/fe-gtk/xtext.c
View File

@ -4729,6 +4729,7 @@ void
gtk_xtext_append (xtext_buffer *buf, unsigned char *text, int len, time_t stamp) gtk_xtext_append (xtext_buffer *buf, unsigned char *text, int len, time_t stamp)
{ {
textentry *ent; textentry *ent;
gboolean truncate = FALSE;
if (len == -1) if (len == -1)
len = strlen (text); len = strlen (text);
@ -4737,12 +4738,27 @@ gtk_xtext_append (xtext_buffer *buf, unsigned char *text, int len, time_t stamp)
len--; len--;
if (len >= sizeof (buf->xtext->scratch_buffer)) if (len >= sizeof (buf->xtext->scratch_buffer))
{
len = sizeof (buf->xtext->scratch_buffer) - 1; len = sizeof (buf->xtext->scratch_buffer) - 1;
truncate = TRUE;
}
ent = g_malloc (len + 1 + sizeof (textentry)); ent = g_malloc (len + 1 + sizeof (textentry));
ent->str = (unsigned char *) ent + sizeof (textentry); ent->str = (unsigned char *) ent + sizeof (textentry);
safe_strcpy (ent->str, text, len); ent->str_len = len;
ent->str_len = strlen (ent->str); /* Possibly truncated */ if (len)
{
if (!truncate)
{
memcpy (ent->str, text, len);
ent->str[len] = '\0';
}
else
{
safe_strcpy (ent->str, text, sizeof (buf->xtext->scratch_buffer));
ent->str_len = strlen (ent->str);
}
}
ent->indent = 0; ent->indent = 0;
ent->left_len = -1; ent->left_len = -1;