Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cortex: Fix buffer overflows in label truncation.

Browse Source 
The label to be truncated was copied into a fixed width buffer without
taking the null byte into account which would make
BFont::GetTruncatedStrings() read out of bounds when the name got long
enough. The output strings were also not allocated with the required
extra space for the ellipsis which would possibly have caused the
output to overflow.

Since the goal is to truncate a single string, remove the entire
temporary extra allocations and simplify to use BFont::TruncateString()
directly, which avoids both problems by being BString based.

Change-Id: Ib57430faf6f706c705497191000ee9686441857e
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3116
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
This commit is contained in:
Michael Lotz 2020-08-01 00:50:09 +02:00 committed by waddlesplash
parent 6199db56e1
commit de6a5cb90c
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/apps/cortex/MediaRoutingView/MediaNodePanel.cpp
View File

@ -841,24 +841,12 @@ void MediaNodePanel::_prepareLabel()
}
// truncate the label to fit in the panel
m_label = m_fullLabel;
float maxWidth = m_labelRect.Width() - (2.0 * M_LABEL_H_MARGIN) - 2.0;
if (be_plain_font->StringWidth(m_fullLabel.String()) > maxWidth)
{
char *truncatedLabel[1];
truncatedLabel[0] = new char[B_MEDIA_NAME_LENGTH];
const char *originalLabel[1];
originalLabel[0] = new char[B_MEDIA_NAME_LENGTH];
m_fullLabel.CopyInto(const_cast<char *>(originalLabel[0]), 0, B_MEDIA_NAME_LENGTH);
be_plain_font->GetTruncatedStrings(originalLabel, 1, B_TRUNCATE_END, maxWidth, (char **) truncatedLabel);
m_label = truncatedLabel[0];
be_plain_font->TruncateString(&m_label, B_TRUNCATE_END, maxWidth);
m_labelTruncated = true;
delete [] originalLabel[0];
delete [] truncatedLabel[0];
}
else
{
m_label = m_fullLabel;
m_labelTruncated = false;
}
// Construct labelOffset