ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Fix issue when importing m4a

Browse Source 
PBD::RingBuffer<>::rw_vector can return a NULL pointer
for the 2nd buffer, which can lead to undefined behavior:
`memcpy (NULL, src, 0);`
This commit is contained in:
Robin Gareus 2021-06-29 00:11:17 +02:00
parent f8a5d45b7a
commit bd6fb8f172
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/ardour/ffmpegfileimportable.cc
View File

@ -236,6 +236,9 @@ FFMPEGFileImportableSource::did_read_data (std::string data, size_t size)
samplecnt_t written = 0; samplecnt_t written = 0;
for (int i = 0; i < 2; ++i) { for (int i = 0; i < 2; ++i) {
samplecnt_t cnt = std::min<samplecnt_t> (n_samples, wv.len[i]); samplecnt_t cnt = std::min<samplecnt_t> (n_samples, wv.len[i]);
if (!cnt || !wv.buf[i]) {
break;
}
memcpy (wv.buf[i], cur, cnt * sizeof (float)); memcpy (wv.buf[i], cur, cnt * sizeof (float));
written += cnt; written += cnt;
n_samples -= cnt; n_samples -= cnt;