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

Proposed by Trent Lloyd on 2016-06-12
Status: Superseded
Proposed branch: lp:~lathiat/unity-control-center/lp1304388
Merge into: lp:unity-control-center
Diff against target: 12 lines (+1/-1)
1 file modified
panels/info/cc-info-panel.c (+1/-1)
To merge this branch: bzr merge lp:~lathiat/unity-control-center/lp1304388
Reviewer Review Type Date Requested Status
Unity Control Center development team 2016-06-12 Pending
Review via email:

This proposal has been superseded by a proposal from 2016-06-12.

Description of the change

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

To post a comment you must log in.
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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'panels/info/cc-info-panel.c'
2--- panels/info/cc-info-panel.c 2016-03-09 22:06:07 +0000
3+++ panels/info/cc-info-panel.c 2016-06-12 12:51:53 +0000
4@@ -813,7 +813,7 @@
5 pattern = g_pattern_spec_new (app_data->extra_type_filter);
6 mime_types = g_app_info_get_supported_types (info);
8- for (i = 0; mime_types[i]; i++)
9+ for (i = 0; mime_types && mime_types[i]; i++)
10 {
11 if (!g_pattern_match_string (pattern, mime_types[i]))
12 continue;


People subscribed via source and target branches