Merge lp:~lathiat/unity-control-center/lp1304388 into lp:unity-control-center

[Trent Lloyd]

This patch from upstream fixes a crash when changing the default browser handler (Bug #1304388)

This should be imported to both 14.04 and 16.04

[lp:~lathiat/unity-control-center/lp1304388]

12867. By Trent Lloyd on 2016-06-12

Fix crash when application supports no mime-type

Both Firefox and Chrome have been seen setting themselves as the
default handler for x-scheme-handler/http without actually handling
any mime-types, causing a NULL pointer crash when attempting to
iterate the list.

Check for NULL condition using patch from upstream commit
d9f08df39cafbd1f15c510da444f8ac913cdc493 (Fixes: #1304388)

Unmerged revisions

=== modified file 'panels/info/cc-info-panel.c'
--- panels/info/cc-info-panel.c	2016-03-09 22:06:07 +0000
+++ panels/info/cc-info-panel.c	2016-06-12 12:51:53 +0000
@@ -813,7 +813,7 @@
       pattern = g_pattern_spec_new (app_data->extra_type_filter);
       mime_types = g_app_info_get_supported_types (info);
 
-      for (i = 0; mime_types[i]; i++)
+      for (i = 0; mime_types && mime_types[i]; i++)
         {
           if (!g_pattern_match_string (pattern, mime_types[i]))
             continue;