Fix a possible but insignificant leak in MythArchive's VideoSelector:…

…:getVideoListFromDB(). Coverity defect 703764
MythTV · Jun 7, 2012 · 18d0a1c · 18d0a1c
1 parent d314019
commit 18d0a1c
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/mythplugins/mytharchive/mytharchive/videoselector.cpp b/mythplugins/mytharchive/mytharchive/videoselector.cpp
@@ -411,14 +411,13 @@ vector<VideoInfo *> *VideoSelector::getVideoListFromDB(void)
         }
     }
 
-    vector<VideoInfo*> *videoList = new vector<VideoInfo*>;
-
     query.prepare("SELECT intid, title, plot, length, filename, coverfile, "
                   "category, showlevel, subtitle, season, episode "
                   "FROM videometadata ORDER BY title,season,episode");
 
     if (query.exec() && query.size())
     {
+        vector<VideoInfo*> *videoList = new vector<VideoInfo*>;
         QString artist, genre, episode;
         while (query.next())
         {
@@ -449,14 +448,12 @@ vector<VideoInfo *> *VideoSelector::getVideoListFromDB(void)
                 info->category = "(None)";
             videoList->push_back(info);
         }
+        return videoList;
     }
-    else
+
-    {
+
-        LOG(VB_GENERAL, LOG_ERR, "VideoSelector: Failed to get any video's");
+    LOG(VB_GENERAL, LOG_ERR, "VideoSelector: Failed to get any video's");
-        return NULL;
+    return NULL;
-    }
-
-    return videoList;
 }
 
 void VideoSelector::getVideoList(void)