Fix null pointer check _after_ dereference in SetPreviewGenerator(). …

…Coverity 700692
MythTV · Dec 18, 2012 · 46f0b4f · 46f0b4f
1 parent b7b6e62
commit 46f0b4f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/mythtv/libs/libmythtv/previewgeneratorqueue.cpp b/mythtv/libs/libmythtv/previewgeneratorqueue.cpp
@@ -470,6 +470,9 @@ void PreviewGeneratorQueue::UpdatePreviewGeneratorThreads(void)
 void PreviewGeneratorQueue::SetPreviewGenerator(
     const QString &key, PreviewGenerator *g)
 {
+    if (!g)
+        return;
+
     {
         QMutexLocker locker(&m_lock);
         m_tokenToKeyMap[g->GetToken()] = key;
@@ -481,9 +484,10 @@ void PreviewGeneratorQueue::SetPreviewGenerator(
                 if (!g->GetToken().isEmpty())
                     state.tokens.insert(g->GetToken());
                 g->deleteLater();
+                g = NULL;
             }
         }
-        else if (g)
+        else
         {
             g->AttachSignals(this);
             state.gen = g;