Fixed segfault when reading an invalid/incomplete .desktop file (bsc#…

…1090843)

When "X-SuSE-YaST-Group" value is missing or uses an unknown value
then it cannot be properly grouped in the view, so skip the invalid
files.

src/yqdesktopfilesmodel.h

@@ -41,6 +41,7 @@ typedef QMapIterator<QString, QVariant> PropertyMapIterator;
 // desktop file -> properties
 typedef QMap<QString, PropertyMap > PropertyMapCache;
 typedef QMapIterator<QString, PropertyMap> PropertyMapCacheIterator;
+typedef QMutableMapIterator<QString, PropertyMap> PropertyMapCacheMutableIterator;
 
 class cmp;
 

src/yqmodulesmodel.cpp

@@ -227,6 +227,22 @@ void YQModulesModel::removeEmptyGroups()
  	groups <<  groupsModel()->groupId( idx );
     }
 
+    // filter out the .desktop files with unknown or undefined group,
+    // otherwise grouping segfaults later
+    PropertyMapCacheMutableIterator it(d->cache);
+    while ( it.hasNext() )
+    {
+        it.next();
+        QString group = it.value().value("X-SuSE-YaST-Group").toString();
+        if ( !groups.contains( group ) )
+        {
+            QString file = it.key();
+            qWarning() << "Warning: Skipping file" << file << "with unknown group" << group;
+            d->desktop_files.removeAll( file );
+            it.remove();
+        }
+    }
+
     QStringListIterator  git(groups);
     while (git.hasNext())
     {