w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a potential crashes in BWF (WAV) file writes

This commit is contained in:
Bill Somerville 2018-11-11 18:55:34 +00:00
parent 682170ae54
commit 0b03ad4c09
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Audio/BWFFile.cpp
View File

@ -36,7 +36,8 @@ namespace
{
if (id)
{
auto len = std::min (size_t (4), strlen (id));
auto end = reinterpret_cast<char const *> (::memchr (id, '\0', 4u));
auto len = end ? end - id : 4u;
memcpy (id_.data (), id, len);
if (len < 4u)
{
@ -45,7 +46,7 @@ namespace
}
else
{
memcpy (id_.data (), "JUNK", 4);
memcpy (id_.data (), "JUNK", 4u);
}
}
@ -831,7 +832,8 @@ void BWFFile::bext_coding_history (QByteArray const& text)
m_->header_dirty_ = true;
m_->bext (); // ensure we have a correctly
// initialized m_->bext_
auto length = std::min (strlen (text.constData ()), size_t (text.size ()));
auto end = static_cast<char const *> (::memchr (text.constData (), '\0', size_t (text.size ())));
auto length = end ? end - text.constData () : size_t (text.size ());
m_->bext_.resize (sizeof (BroadcastAudioExtension) + length);
std::strncpy (m_->bext ()->coding_history_, text.constData (), length);
}