Merge lp:~saviq/qtubuntu/more-robust-desktop-parsing into lp:qtubuntu

[Michał Sawicz]

Make desktop file parsing more robust.

Ignore spaces around "=" and error out on malformed lines.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:158
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/45/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/33
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/33/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qtubuntu-ci/45/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/qtubuntu-autolanding/41/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-trusty-armhf-autolanding/2/console

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

SurfaceFlinger support dropped, so this MR invalid

review: Disapprove

Unmerged revisions

158. By Michał Sawicz on 2013-07-25

Also skip if just the key was provided.

157. By Michał Sawicz on 2013-07-25

Ignore spaces around "=" in .desktop files.

156. By Michał Sawicz on 2013-07-25

Scan for a [Desktop Entry] group, don't assume it's on the first line.

=== modified file 'src/modules/application/application_manager.cc'
--- src/modules/application/application_manager.cc	2013-07-25 13:01:28 +0000
+++ src/modules/application/application_manager.cc	2013-07-25 13:01:28 +0000
@@ -181,12 +181,12 @@
        this, desktopFile.toLatin1().data());
   DASSERT(desktopFile != NULL);
   const struct { const char* const name; int size; unsigned int flag; } kEntryNames[] = {
-    { "Name=", sizeof("Name=") - 1, 1 << DesktopData::kNameIndex },
-    { "Comment=", sizeof("Comment=") - 1, 1 << DesktopData::kCommentIndex },
-    { "Icon=", sizeof("Icon=") - 1, 1 << DesktopData::kIconIndex },
-    { "Exec=", sizeof("Exec=") - 1, 1 << DesktopData::kExecIndex },
-    { "Path=", sizeof("Path=") - 1, 1 << DesktopData::kPathIndex },
-    { "X-Ubuntu-StageHint=", sizeof("X-Ubuntu-StageHint=") - 1, 1 << DesktopData::kStageHintIndex }
+    { "Name", sizeof("Name") - 1, 1 << DesktopData::kNameIndex },
+    { "Comment", sizeof("Comment") - 1, 1 << DesktopData::kCommentIndex },
+    { "Icon", sizeof("Icon") - 1, 1 << DesktopData::kIconIndex },
+    { "Exec", sizeof("Exec") - 1, 1 << DesktopData::kExecIndex },
+    { "Path", sizeof("Path") - 1, 1 << DesktopData::kPathIndex },
+    { "X-Ubuntu-StageHint", sizeof("X-Ubuntu-StageHint") - 1, 1 << DesktopData::kStageHintIndex }
   };
   const unsigned int kAllEntriesMask =
       (1 << DesktopData::kNameIndex) | (1 << DesktopData::kCommentIndex)
@@ -207,11 +207,9 @@
   }
 
   // Validate "magic key" (standard group header).
-  if (file.readLine(buffer, kBufferSize) != -1) {
-    if (strncmp(buffer, "[Desktop Entry]", sizeof("[Desktop Entry]" - 1))) {
-      DLOG("not a desktop file");
-      return false;
-    }
+  while (file.readLine(buffer, kBufferSize) != -1) {
+    if (!strncmp(buffer, "[Desktop Entry]", sizeof("[Desktop Entry]" - 1)))
+      break;
   }
 
   int length;
@@ -224,17 +222,50 @@
         DLOG("reached next group header, leaving loop");
         break;
       }
+      bool validLine = true;
       // Lookup entries ignoring duplicates if any.
       for (int i = 0; i < kEntriesCount; i++) {
         if (!strncmp(buffer, kEntryNames[i].name, kEntryNames[i].size)) {
           if (~entryFlags & kEntryNames[i].flag) {
+            int keyLength = kEntryNames[i].size;
             buffer[length-1] = '\0';
-            entries_[i] = QString::fromLatin1(&buffer[kEntryNames[i].size]);
+
+            if (length == keyLength + 1) {
+                validLine = false;
+                break;
+            }
+
+            if ((const char)buffer[keyLength] != ' ' && (const char)buffer[keyLength] != '=') {
+              // Skip, not the key we're looking for.
+              continue;
+            }
+
+            bool gotEqual = false;
+            while(keyLength < length) {
+              if ((const char)buffer[keyLength] ==  ' ') {
+                // Ignore spaces.
+              } else if ((const char)buffer[keyLength] == '=') {
+                gotEqual = true;
+              } else {
+                break;
+              }
+              keyLength++;
+            }
+            if (!gotEqual) {
+              validLine = false;
+              break;
+            }
+            entries_[i] = QString::fromLatin1(&buffer[keyLength]);
             entryFlags |= kEntryNames[i].flag;
+            DLOG("Found entry for %s: %s", kEntryNames[i].name, entries_[i].toLatin1().data());
             break;
           }
         }
       }
+      if (!validLine) {
+        DLOG("Malformed .desktop file entry, ignoring: %s", buffer);
+        continue;
+      }
       // Stop when matching the right number of entries.
       if (entryFlags == kAllEntriesMask) {
         break;