From 5c09bba97942bad4862644a9589bd62f6e6aa2d7 Mon Sep 17 00:00:00 2001 From: Dyami Caliri Date: Thu, 27 Mar 2014 09:29:38 -0700 Subject: CoreAudio: Mismatched new[]/delete in several places. The CoreAudio plugin code in QtMultimedia had several different places where an array was allocated with "new[]" and deleted with "delete". Fixed by deleting with "delete[]". Task-number: QTBUG-37861 Change-Id: Id85bc07a054ad161b0403cc0fe5c56ec5b41d4e3 Reviewed-by: Andy Nichols --- src/plugins/coreaudio/coreaudiodeviceinfo.mm | 6 +++--- src/plugins/coreaudio/coreaudioutils.mm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/coreaudio/coreaudiodeviceinfo.mm b/src/plugins/coreaudio/coreaudiodeviceinfo.mm index 74a692c10..56765cafd 100644 --- a/src/plugins/coreaudio/coreaudiodeviceinfo.mm +++ b/src/plugins/coreaudio/coreaudiodeviceinfo.mm @@ -110,7 +110,7 @@ QAudioFormat CoreAudioDeviceInfo::preferredFormat() const } } - delete streams; + delete[] streams; } } #else //iOS @@ -180,7 +180,7 @@ QList CoreAudioDeviceInfo::supportedSampleRates() } } - delete vr; + delete[] vr; } } #else //iOS @@ -380,7 +380,7 @@ QList CoreAudioDeviceInfo::availableDevices(QAudio::Mode mode) } } - delete audioDevices; + delete[] audioDevices; } } #else //iOS diff --git a/src/plugins/coreaudio/coreaudioutils.mm b/src/plugins/coreaudio/coreaudioutils.mm index d43303a1d..e626561d1 100644 --- a/src/plugins/coreaudio/coreaudioutils.mm +++ b/src/plugins/coreaudio/coreaudioutils.mm @@ -125,7 +125,7 @@ CoreAudioRingBuffer::CoreAudioRingBuffer(int bufferSize): CoreAudioRingBuffer::~CoreAudioRingBuffer() { - delete m_buffer; + delete[] m_buffer; } CoreAudioRingBuffer::Region CoreAudioRingBuffer::acquireReadRegion(int size) -- cgit v1.2.1