From: Cole Robinson Date: Fri, 6 May 2016 18:03:05 +0000 (-0400) Subject: ui: gtk: fix crash when terminal inner-border is NULL X-Git-Tag: v2.6.1~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f9745afaab0f1768acada45ee8aee2acb91e378;p=thirdparty%2Fqemu.git ui: gtk: fix crash when terminal inner-border is NULL VTE terminal inner-border can be NULL. The vte-0.36 (API 2.90) code checks for the condition too so I assume it's not just a bug Fixes a crash on Fedora 24 with gtk 3.20 Signed-off-by: Cole Robinson Message-id: 2b2e85d403e8760ea53afd735a170500d5c17716.1462557436.git.crobinso@redhat.com Signed-off-by: Gerd Hoffmann (cherry picked from commit 4fd811a6bd0b8f24f4761fc281454494c336d310) Signed-off-by: Michael Roth --- diff --git a/ui/gtk.c b/ui/gtk.c index f372a6d5ae2..9876d899aa9 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -340,10 +340,12 @@ static void gd_update_geometry_hints(VirtualConsole *vc) geo.min_height = geo.height_inc * VC_TERM_Y_MIN; mask |= GDK_HINT_MIN_SIZE; gtk_widget_style_get(vc->vte.terminal, "inner-border", &ib, NULL); - geo.base_width += ib->left + ib->right; - geo.base_height += ib->top + ib->bottom; - geo.min_width += ib->left + ib->right; - geo.min_height += ib->top + ib->bottom; + if (ib) { + geo.base_width += ib->left + ib->right; + geo.base_height += ib->top + ib->bottom; + geo.min_width += ib->left + ib->right; + geo.min_height += ib->top + ib->bottom; + } geo_widget = vc->vte.terminal; #endif }