mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-07 14:46:33 +02:00
Code Issues Releases Wiki Activity

* Don't ever accept invalid results coming from resolvers.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-07-01 20:54:06 +02:00
parent bbec1dfbbe
commit 53b00db602
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libtomahawk/resolvers/QtScriptResolver.cpp
View File

@@ -408,6 +408,8 @@ QtScriptResolver::parseResultVariantList( const QVariantList& reslist )
foreach( const QVariant& rv, reslist ) foreach( const QVariant& rv, reslist )
{ {
QVariantMap m = rv.toMap(); QVariantMap m = rv.toMap();
if ( m.value( "artist" ).toString().trimmed().isEmpty() || m.value( "track" ).toString().trimmed().isEmpty() )
continue;
Tomahawk::result_ptr rp = Tomahawk::Result::get( m.value( "url" ).toString() ); Tomahawk::result_ptr rp = Tomahawk::Result::get( m.value( "url" ).toString() );
Tomahawk::artist_ptr ap = Tomahawk::Artist::get( m.value( "artist" ).toString(), false ); Tomahawk::artist_ptr ap = Tomahawk::Artist::get( m.value( "artist" ).toString(), false );

4
src/libtomahawk/resolvers/ScriptResolver.cpp
View File

@@ -269,7 +269,9 @@ ScriptResolver::handleMsg( const QByteArray& msg )
foreach( const QVariant& rv, reslist ) foreach( const QVariant& rv, reslist )
{ {
QVariantMap m = rv.toMap(); QVariantMap m = rv.toMap();
qDebug() << "Found result:" << m; tDebug( LOGVERBOSE ) << "Found result:" << m;
if ( m.value( "artist" ).toString().trimmed().isEmpty() || m.value( "track" ).toString().trimmed().isEmpty() )
continue;
Tomahawk::result_ptr rp = Tomahawk::Result::get( m.value( "url" ).toString() ); Tomahawk::result_ptr rp = Tomahawk::Result::get( m.value( "url" ).toString() );
Tomahawk::artist_ptr ap = Tomahawk::Artist::get( m.value( "artist" ).toString(), false ); Tomahawk::artist_ptr ap = Tomahawk::Artist::get( m.value( "artist" ).toString(), false );