6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-27 00:30:26 +00:00
Code Issues Projects Releases Wiki Activity

Avoid potential attempt to free enqueued buffers at dealloc.

Browse Source
This commit is contained in:
Thomas Harte 2022-07-15 15:21:58 -04:00
parent bae47fca20
commit ee7ef81054
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OSBindings/Mac/Clock Signal/Audio/CSAudioQueue.m
View File

@ -47,7 +47,11 @@
if(self) { if(self) {
_deallocLock = [[NSLock alloc] init]; _deallocLock = [[NSLock alloc] init];
_deallocLock.name = @"Dealloc lock";
_queueLock = [[NSLock alloc] init]; _queueLock = [[NSLock alloc] init];
_queueLock.name = @"Audio queue access lock";
atomic_store_explicit(&_enqueuedBuffers, 0, memory_order_relaxed); atomic_store_explicit(&_enqueuedBuffers, 0, memory_order_relaxed);
_samplingRate = samplingRate; _samplingRate = samplingRate;
@ -115,6 +119,12 @@
- (void)dealloc { - (void)dealloc {
[_deallocLock lock]; [_deallocLock lock];
// Ensure no buffers remain enqueued by stopping the queue.
if(_audioQueue) {
OSSGuard(AudioQueueStop(_audioQueue, true));
}
// Free all buffers.
for(size_t c = 0; c < NumBuffers; c++) { for(size_t c = 0; c < NumBuffers; c++) {
if(_buffers[c]) { if(_buffers[c]) {
OSSGuard(AudioQueueFreeBuffer(_audioQueue, _buffers[c])); OSSGuard(AudioQueueFreeBuffer(_audioQueue, _buffers[c]));
@ -122,6 +132,7 @@
} }
} }
// Dispose of the queue.
if(_audioQueue) { if(_audioQueue) {
OSSGuard(AudioQueueDispose(_audioQueue, true)); OSSGuard(AudioQueueDispose(_audioQueue, true));
_audioQueue = NULL; _audioQueue = NULL;