Merge lp:~donadigo/wingpanel-indicator-notifications/fix-g-str-hash-crash into lp:~wingpanel-devs/wingpanel-indicator-notifications/wingpanel-indicator-notifications

[Adam Bieńkowski]

* Fix g_str_hash crashes.

Fixes bug #1641270: "latest update broke wingpanel".

This will check if the notification has a valid app info with not it's ID which will prevent from g_str_hash segfaults in some cases.

This probably should be done differently and better in the NotificationsMonitor, but for now this simple check will do.

[Felipe Escoto (philip.scott)]

It looks like a sane fix, but is there a way to trigger the crash without the patch? :)

[Adam Bieńkowski (donadigo)]

philip.scott: I didn't really test it, but I did some tests with AppInfo class, and basically get_id () can return null and in my tests, appending an index to the hashtable made it crash because the string is null and HashTable cannot hash it.

[Felipe Escoto (philip.scott)]

Looks like a sane check to me!

review: Approve

=== modified file 'src/Widgets/NotificationsList.vala'
--- src/Widgets/NotificationsList.vala	2016-07-21 12:52:41 +0000
+++ src/Widgets/NotificationsList.vala	2016-11-20 13:34:19 +0000
@@ -106,6 +106,11 @@
     }
 
     private AppEntry? add_entry_internal (NotificationEntry entry) {
+        if (entry.notification.app_info == null ||
+            entry.notification.app_info.get_id () == null) {
+            return null;
+        }
+
         AppEntry? app_entry = null;
         bool add = !(entry.notification.desktop_id in construct_desktop_id_list ());
         if (add) {