From d3ceea30f86368f0232b6e216c50fdebbb42611b Mon Sep 17 00:00:00 2001
From: Michael Goddard <michael.goddard@nokia.com>
Date: Wed, 26 Oct 2011 15:33:16 +1000
Subject: [PATCH] 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)
---
 src/multimedia/effects/qsamplecache_p.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/multimedia/effects/qsamplecache_p.cpp b/src/multimedia/effects/qsamplecache_p.cpp
index c7e77d7..69c8d66 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;
 }
-- 
2.7.4