]> Pileus Git - ~andy/gtk/commitdiff
quartz: Null check title before setting it
authorAlan McGovern <alan@xamarin.com>
Wed, 6 Mar 2013 11:06:09 +0000 (11:06 +0000)
committerAleksander Morgado <aleksander@lanedo.com>
Wed, 6 Mar 2013 11:37:44 +0000 (12:37 +0100)
This avoids a crash in objective-c.

https://bugzilla.gnome.org/show_bug.cgi?id=695278

gdk/quartz/gdkwindow-quartz.c

index a096064ae38c09544496d432ab99388b68ae54d5..5550fa88a323cefdd76a93000e57dfe012d3c224 100644 (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];