fixed possible null-pointer dereference in transport plugins

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2958 90c681e8-e032-0410-971d-27865f9a5e38

2 files changed, 7 insertions, 4 deletions

diff --git a/src/plugins/Transports/mms/mmsstreamreader.cpp b/src/plugins/Transports/mms/mmsstreamreader.cpp
index 008fbe5a5..3b3d90589 100644
--- a/src/plugins/Transports/mms/mmsstreamreader.cpp
+++ b/src/plugins/Transports/mms/mmsstreamreader.cpp
@@ -24,11 +24,12 @@
 #include <qmmp/qmmp.h>
 #include <qmmp/statehandler.h>
 #include <qmmp/inputsource.h>
+#include "mmsinputsource.h"
 #include "mmsstreamreader.h"
 
-MMSStreamReader::MMSStreamReader(const QString &url, QObject *parent)
-        : QIODevice(parent)
+MMSStreamReader::MMSStreamReader(const QString &url, MMSInputSource *parent) : QIODevice(parent)
 {
+    m_parent = parent;
     m_url = url;
     m_handle = 0;
     m_aborted = false;
@@ -197,7 +198,7 @@ void MMSStreamReader::checkBuffer()
         qDebug("MMSStreamReader: ready");
         QMap<Qmmp::MetaData, QString> metaData;
         metaData.insert(Qmmp::URL, m_url);
-        (qobject_cast<InputSource *>(parent()))->addMetaData(metaData);
+        m_parent->addMetaData(metaData);
         emit ready();
     }
     else if (!m_ready)
diff --git a/src/plugins/Transports/mms/mmsstreamreader.h b/src/plugins/Transports/mms/mmsstreamreader.h
index a3bb15e7a..6a95d65f9 100644
--- a/src/plugins/Transports/mms/mmsstreamreader.h
+++ b/src/plugins/Transports/mms/mmsstreamreader.h
@@ -31,6 +31,7 @@
 
 class QFileInfo;
 class DownloadThread;
+class MMSInputSource;
 
 /*! @internal
  *   @author Ilya Kotov <forkotov02@hotmail.ru>
@@ -39,7 +40,7 @@ class MMSStreamReader : public QIODevice
 {
     Q_OBJECT
 public:
-    MMSStreamReader(const QString &url, QObject *parent = 0);
+    MMSStreamReader(const QString &url, MMSInputSource *parent);
 
     ~MMSStreamReader();
 
@@ -81,6 +82,7 @@ private:
     qint64 m_buffer_at;
     bool m_ready;
     DownloadThread *m_thread;
+    MMSInputSource *m_parent;
 };
 
 class DownloadThread : public QThread