From patchwork Fri May 13 12:32:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 67775 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp245550qge; Fri, 13 May 2016 05:40:22 -0700 (PDT) X-Received: by 10.140.29.9 with SMTP id a9mr15071539qga.37.1463143222455; Fri, 13 May 2016 05:40:22 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id f203si11931461qhf.75.2016.05.13.05.40.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 13 May 2016 05:40:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:34382 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b1COD-0001JF-VS for patch@linaro.org; Fri, 13 May 2016 08:40:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b1CHG-0005B0-1g for qemu-devel@nongnu.org; Fri, 13 May 2016 08:33:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b1CH8-0006jn-Qx for qemu-devel@nongnu.org; Fri, 13 May 2016 08:33:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51934) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b1CH8-0006iJ-Kg for qemu-devel@nongnu.org; Fri, 13 May 2016 08:33:02 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E79A6800A8 for ; Fri, 13 May 2016 12:33:00 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-35.ams2.redhat.com [10.36.116.35]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u4DCWxE7027122; Fri, 13 May 2016 08:33:00 -0400 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 3FDC081907; Fri, 13 May 2016 14:32:59 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 13 May 2016 14:32:41 +0200 Message-Id: <1463142777-13040-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1463142777-13040-1-git-send-email-kraxel@redhat.com> References: <1463142777-13040-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 13 May 2016 12:33:00 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL v2 01/17] ui: gtk: fix crash when terminal inner-border is NULL X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann , Cole Robinson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Cole Robinson 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 --- ui/gtk.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 1.8.3.1 diff --git a/ui/gtk.c b/ui/gtk.c index f372a6d..9876d89 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 }