3 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
index 866d517e1..f1e3d543a 100644
--- a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
+++ b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
@@ -427,14 +427,13 @@ bool DecoderCDAudio::initialize()
                 return false;
             }
             qDebug("DecoderCDAudio: found cd audio capable drive \"%s\"", *cd_drives);
+            cdio_free_device_list(cd_drives);  //free device list
         }
         else
         {
             qWarning("DecoderCDAudio: unable to find cd audio drive.");
             return false;
         }
-        if (cd_drives && *cd_drives) //free device list
-            cdio_free_device_list(cd_drives);
     }
     else
     {
diff --git a/src/plugins/Input/sid/decoder_sid.cpp b/src/plugins/Input/sid/decoder_sid.cpp
index 351db3754..b89617913 100644
--- a/src/plugins/Input/sid/decoder_sid.cpp
+++ b/src/plugins/Input/sid/decoder_sid.cpp
@@ -78,6 +78,7 @@ bool DecoderSID::initialize()
     if(!tune->getStatus())
     {
         qWarning("DecoderSID: error: %s", tune->statusString());
+        delete tune;
         return false;
     }
 
diff --git a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp
index 2d7da6167..b0b475095 100644
--- a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp
+++ b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp
@@ -58,7 +58,6 @@ QList<FileInfo *> DecoderWavPackFactory::createPlayList(const QString &fileName,
     QList <FileInfo*> list;
     char err[80];
     int cue_len=0;
-    FileInfo *info;
     //extract metadata of one cue track
     if(fileName.contains("://"))
     {
@@ -90,7 +89,7 @@ QList<FileInfo *> DecoderWavPackFactory::createPlayList(const QString &fileName,
         qWarning("DecoderWavPackFactory: error: %s", err);
         return list;
     }
-    info = new FileInfo(fileName);
+    FileInfo *info = new FileInfo(fileName);
     if (useMetaData)
     {
         cue_len = WavpackGetTagItem (ctx, "cuesheet", NULL, 0);