From 53b00db602f9aa8daeb09c838104a5d9778598f3 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 1 Jul 2012 20:54:06 +0200 Subject: [PATCH] * Don't ever accept invalid results coming from resolvers. --- src/libtomahawk/resolvers/QtScriptResolver.cpp | 2 ++ src/libtomahawk/resolvers/ScriptResolver.cpp | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libtomahawk/resolvers/QtScriptResolver.cpp b/src/libtomahawk/resolvers/QtScriptResolver.cpp index 98de8f86b..e58a7b090 100644 --- a/src/libtomahawk/resolvers/QtScriptResolver.cpp +++ b/src/libtomahawk/resolvers/QtScriptResolver.cpp @@ -408,6 +408,8 @@ QtScriptResolver::parseResultVariantList( const QVariantList& reslist ) foreach( const QVariant& rv, reslist ) { 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::artist_ptr ap = Tomahawk::Artist::get( m.value( "artist" ).toString(), false ); diff --git a/src/libtomahawk/resolvers/ScriptResolver.cpp b/src/libtomahawk/resolvers/ScriptResolver.cpp index 8b82cf437..4902d7a56 100644 --- a/src/libtomahawk/resolvers/ScriptResolver.cpp +++ b/src/libtomahawk/resolvers/ScriptResolver.cpp @@ -269,7 +269,9 @@ ScriptResolver::handleMsg( const QByteArray& msg ) foreach( const QVariant& rv, reslist ) { 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::artist_ptr ap = Tomahawk::Artist::get( m.value( "artist" ).toString(), false );