Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-07 12:12:23 +01:00
Code Issues Releases Wiki Activity

Fix possible memory leak in use of overrides of BlockFile::CalcSummary

Browse Source
This commit is contained in:
Paul Licameli
2016-04-05 23:30:33 -04:00
parent cea79d5b73
commit 1108c1376c
8 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/BlockFile.cpp
View File

@@ -86,7 +86,7 @@ SummaryInfo::SummaryInfo(sampleCount samples)
totalSummaryBytes = offset256 + (frames256 * bytesPerFrame);
}
char *BlockFile::fullSummary = 0;
ArrayOf<char> BlockFile::fullSummary;
/// Initializes the base BlockFile data. The block is initially
/// unlocked and its reference count is 1.
@@ -181,11 +181,6 @@ bool BlockFile::Deref()
return false;
}
void BlockFile::Deinit()
{
if(fullSummary)delete[] fullSummary;
}
/// Get a buffer containing a summary block describing this sample
/// data. This must be called by derived classes when they
/// are constructed, to allow them to construct their summary data,
@@ -201,15 +196,17 @@ void BlockFile::Deinit()
/// @param len The length of the sample data
/// @param format The format of the sample data.
void *BlockFile::CalcSummary(samplePtr buffer, sampleCount len,
sampleFormat format)
sampleFormat format, ArrayOf<char> &cleanup)
{
if(fullSummary)delete[] fullSummary;
fullSummary = new char[mSummaryInfo.totalSummaryBytes];
// Caller has nothing to deallocate
cleanup.reset();
memcpy(fullSummary, headerTag, headerTagLen);
fullSummary.reinit(mSummaryInfo.totalSummaryBytes);
float *summary64K = (float *)(fullSummary + mSummaryInfo.offset64K);
float *summary256 = (float *)(fullSummary + mSummaryInfo.offset256);
memcpy(fullSummary.get(), headerTag, headerTagLen);
float *summary64K = (float *)(fullSummary.get() + mSummaryInfo.offset64K);
float *summary256 = (float *)(fullSummary.get() + mSummaryInfo.offset256);
float *fbuffer = new float[len];
CopySamples(buffer, format,
@@ -303,7 +300,7 @@ void *BlockFile::CalcSummary(samplePtr buffer, sampleCount len,
delete[] fbuffer;
return fullSummary;
return fullSummary.get();
}
static void ComputeMinMax256(float *summary256,
@@ -581,8 +578,9 @@ void AliasBlockFile::WriteSummary()
SampleBuffer sampleData(mLen, floatSample);
this->ReadData(sampleData.ptr(), floatSample, 0, mLen);
ArrayOf<char> cleanup;
void *summaryData = BlockFile::CalcSummary(sampleData.ptr(), mLen,
floatSample);
floatSample, cleanup);
summaryFile.Write(summaryData, mSummaryInfo.totalSummaryBytes);
}