diff options
author | Michael Goddard <michael.goddard@nokia.com> | 2011-10-26 15:33:16 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-27 03:07:26 +0200 |
commit | d3ceea30f86368f0232b6e216c50fdebbb42611b (patch) | |
tree | 20607fb9731908b99fa29f11100f7bf40e8ede4f /src/multimedia | |
parent | b9fd2c65e1f5a66b520687a881c66919300a5230 (diff) |
Use deleteLater when called on a decoder error.
Since we cleanup the decoder itself, it can crash when the stack
unwinds back into the decoder code. Similarly on a network error.
Change-Id: Ice36a3008359565f186406945973747b3134d296
Reviewed-by: Ling Hu <ling.hu@nokia.com>
(cherry picked from commit fb10bcf6cea520e1c43a77b6b88cf01ae9dc74ad)
Diffstat (limited to 'src/multimedia')
-rw-r--r-- | src/multimedia/effects/qsamplecache_p.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/effects/qsamplecache_p.cpp b/src/multimedia/effects/qsamplecache_p.cpp index c7e77d79a..69c8d66ca 100644 --- a/src/multimedia/effects/qsamplecache_p.cpp +++ b/src/multimedia/effects/qsamplecache_p.cpp @@ -282,8 +282,8 @@ void QSample::release() // must be called locked. void QSample::cleanup() { - delete m_waveDecoder; - delete m_stream; + m_waveDecoder->deleteLater(); + m_stream->deleteLater(); m_waveDecoder = 0; m_stream = 0; } |