ardour/livetrax
13
0
Fork 0
Code

Fix 30dc9ccc86, buf2 needs to remain in scope.

Browse Source 
This fixes a heap-use-after-free.
This commit is contained in:
Robin Gareus 2024-11-06 17:24:00 +01:00
parent a6e2f856a2
commit 5f2371a9e2
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/ardour/audiosource.cc
View File

@ -932,6 +932,7 @@ AudioSource::compute_and_write_peaks (Sample const * buf, samplecnt_t first_samp
samplecnt_t samples_done; samplecnt_t samples_done;
const size_t blocksize = (128 * 1024); const size_t blocksize = (128 * 1024);
off_t first_peak_byte; off_t first_peak_byte;
std::unique_ptr<Sample[]> buf2;
if (-1 == _peakfile_fd) { if (-1 == _peakfile_fd) {
if (prepare_for_peakfile_writes ()) { if (prepare_for_peakfile_writes ()) {
@ -991,7 +992,7 @@ AudioSource::compute_and_write_peaks (Sample const * buf, samplecnt_t first_samp
/* make a new contiguous buffer containing leftovers and the new stuff */ /* make a new contiguous buffer containing leftovers and the new stuff */
to_do = cnt + peak_leftover_cnt; to_do = cnt + peak_leftover_cnt;
std::unique_ptr<Sample[]> buf2(new Sample[to_do]); buf2.reset(new Sample[to_do]);
/* the remnants */ /* the remnants */
memcpy (buf2.get(), peak_leftovers, peak_leftover_cnt * sizeof (Sample)); memcpy (buf2.get(), peak_leftovers, peak_leftover_cnt * sizeof (Sample));