Always check return-value of Track's & Result's get() method.

tomahawk-player · Oct 28, 2014 · 6b8386d · 6b8386d
1 parent 1201b5b
commit 6b8386d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/libtomahawk/database/DatabaseCommand_AllTracks.cpp b/src/libtomahawk/database/DatabaseCommand_AllTracks.cpp
@@ -142,12 +142,16 @@ DatabaseCommand_AllTracks::exec( DatabaseImpl* dbi )
                                                       artist, track, album,
                                                       duration, composer,
                                                       albumpos, discnumber );
+        if ( !t )
+            continue;
 
-        if ( m_album || m_artist ) {
+        if ( m_album || m_artist )
             t->loadAttributes();
-        }
 
         Tomahawk::result_ptr result = Tomahawk::Result::get( url, t );
+        if ( !result )
+            continue;
+
         result->setSize( size );
         result->setBitrate( bitrate );
         result->setModificationTime( modificationTime );