callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

quartz: Null check title before setting it

Browse Source 
This avoids a crash in objective-c.

https://bugzilla.gnome.org/show_bug.cgi?id=695278
This commit is contained in:
Alan McGovern
2013-03-06 11:06:09 +00:00
committed by Aleksander Morgado
parent b0ccdae753
commit e28b10d56f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gdk/quartz/gdkwindow-quartz.c
View File

@ -2642,9 +2642,11 @@ gdk_quartz_window_set_decorations (GdkWindow *window,
* NSTitledWindowMask. This behaved extremely oddly when
* conditionalized upon that and since it has no side effects (i.e.
* if NSTitledWindowMask is not requested, the title will not be
* displayed) just do it unconditionally.
* displayed) just do it unconditionally. We also must null check
* 'title' before setting it to avoid crashing.
*/
[impl->toplevel setTitle:title];
if (title)
[impl->toplevel setTitle:title];
}
else
{
@ -2664,7 +2666,8 @@ gdk_quartz_window_set_decorations (GdkWindow *window,
screen:screen];
[impl->toplevel setHasShadow: window_type_hint_to_shadow (impl->type_hint)];
[impl->toplevel setLevel: window_type_hint_to_level (impl->type_hint)];
[impl->toplevel setTitle:title];
if (title)
[impl->toplevel setTitle:title];
[impl->toplevel setBackgroundColor:bg];
[impl->toplevel setHidesOnDeactivate: window_type_hint_to_hides_on_deactivate (impl->type_hint)];
[impl->toplevel setContentView:old_view];