Skip to content

Commit 9f52887

Browse files
committed
Fix badly deleted vectors in spike sorter
1 parent 7543d31 commit 9f52887

2 files changed

Lines changed: 18 additions & 17 deletions

File tree

Source/Plugins/SpikeSorter/SpikeSortBoxes.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -626,8 +626,8 @@ void SpikeSortBoxes::resizeWaveform(int numSamples)
626626
const ScopedLock myScopedLock(mut);
627627
//StartCriticalSection();
628628
waveformLength = numSamples;
629-
delete pc1;
630-
delete pc2;
629+
delete[] pc1;
630+
delete[] pc2;
631631
pc1 = new float[numChannels * waveformLength];
632632
pc2 = new float[numChannels * waveformLength];
633633
spikeBuffer.clear();
@@ -681,8 +681,8 @@ void SpikeSortBoxes::loadCustomParametersFromXml(XmlElement* electrodeNode)
681681
bPCAjobFinished = UnitNode->getBoolAttribute("PCAjobFinished");
682682
bPCAcomputed = UnitNode->getBoolAttribute("PCAcomputed");
683683

684-
delete(pc1);
685-
delete(pc2);
684+
delete[] pc1;
685+
delete[] pc2;
686686

687687
pc1 = new float[waveformLength*numChannels];
688688
pc2 = new float[waveformLength*numChannels];
@@ -833,8 +833,8 @@ void SpikeSortBoxes::saveCustomParametersToXml(XmlElement* electrodeNode)
833833
SpikeSortBoxes::~SpikeSortBoxes()
834834
{
835835
// wait until PCA job is done (if one was submitted).
836-
delete pc1;
837-
delete pc2;
836+
delete[] pc1;
837+
delete[] pc2;
838838
pc1 = nullptr;
839839
pc2 = nullptr;
840840
}
@@ -1974,7 +1974,7 @@ int PCAjob::svdcmp(float** a, int nRows, int nCols, float* w, float** v)
19741974
}
19751975
}
19761976

1977-
delete rv1;
1977+
delete[] rv1;
19781978

19791979
return (0);
19801980
}
@@ -2122,16 +2122,16 @@ void PCAjob::computeSVD()
21222122
// clear memory
21232123
for (int k = 0; k < dim; k++)
21242124
{
2125-
delete eigvec[k];
2125+
delete[] eigvec[k];
21262126
}
2127-
delete eigvec;
2128-
delete sigvalues;
2127+
delete[] eigvec;
2128+
delete[] sigvalues;
21292129

21302130
// delete covariances
21312131
for (int k = 0; k < dim; k++)
21322132
delete cov[k];
21332133

2134-
delete(cov);
2134+
delete[] cov;
21352135
cov = nullptr;
21362136

21372137
}

Source/Plugins/SpikeSorter/SpikeSorter.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,12 +207,13 @@ void SpikeSorter::updateSettings()
207207

208208
Electrode::~Electrode()
209209
{
210-
delete thresholds;
211-
delete isActive;
212-
delete voltageScale;
213-
delete channels;
214-
delete spikeSort;
215-
delete runningStats;
210+
delete[] thresholds;
211+
delete[] isActive;
212+
delete[] voltageScale;
213+
delete[] channels;
214+
delete[] runningStats;
215+
216+
delete spikeSort;
216217

217218
}
218219

0 commit comments

Comments
 (0)