Merge lp:~mconley/globalmenu-extension/fix-segfault-with-lightning into lp:~chrisccoulson/globalmenu-extension/trunk

[Mike Conley]

While going through <menubar> nodes, the extension was only expecting menuSeperator, menuItem and the like. If it saw something it didn't expect (<observes>, for example), it'd hang.

Now, if the extension sees a tag it doesn't recognize, it just skips over it.

[Chris Coulson (chrisccoulson)]

Thanks for figuring this out.

I had a thought this morning though. Whilst this fixes the original crash, I think there is still an unsolved issue here that will manifest later on.

The way this is designed, relies on each DbusmenuMenuitem to be inserted in to it's DbusmenuMenuitem parent at the same index as it's corresponding DOM node. If we skip a node, I think everything ends up going off-by-1.

Once this has happened, I think we'll end with bits of the menu ending up in the wrong order as other menuitems are inserted, and we could end up removing the wrong menuitems (or crashing) when nodes are removed.

Does this make sense?

I'm not sure of the best way to fix that, other than creating invisible dummy nodes in the menu, just to keep everything in sync.

review: Needs Information

=== modified file 'extensions/globalmenu/components/src/uGlobalMenu.cpp'
--- extensions/globalmenu/components/src/uGlobalMenu.cpp	2011-01-21 01:45:13 +0000
+++ extensions/globalmenu/components/src/uGlobalMenu.cpp	2011-01-31 01:16:43 +0000
@@ -430,6 +430,9 @@
                        mListener,
                        child);
         newItem = static_cast<uGlobalMenuObject *>(sep);
+      } else {
+        // We didn't recognize the tag.  Ignore it, and move on.
+        continue;
       }
 
       AppendMenuObject(newItem);