From nobody Fri May 17 01:44:14 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682696972; cv=none; d=zohomail.com; s=zohoarc; b=Q5I4rOOj3h+6Hc/QcdLL5bxd1OB2qADukNdJ2yqpEqPt9c+QLl2XgJKosvOJmF2+ckQQwkrkaYn6Z/Q35kAdhPHHSXO5+CQHyz7NCf/beU6+h58Uw8gVyAH8g2VsVX9opSePvzHpmbhN0qWwVFu1pNniJ46dho04Ouuok7aO/Ms= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682696972; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=L9RSoDPiCXXsMmvL2LThIxX9RAO9GG2JmdxDzJhNzK4=; b=Am/Y76iIxWVVcbcIkCRxT1OI28VURVo/KdFG/alxc9cAYnvJtLlTX9WUFYbc+xTcrRF7BMd5kokslTDrKmbR5kF7L/r5jlfwEToI8QxEXcNoYEY9fhp+qQLEgjpmZ5+x/kXGScK9yW+2RKt58A8Gj+Y64HUqiCbQ+pw6LShFzs8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682696972358477.4256348938534; Fri, 28 Apr 2023 08:49:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psQKe-0006Eb-Hi; Fri, 28 Apr 2023 11:48:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psQKa-0006ED-CN for qemu-devel@nongnu.org; Fri, 28 Apr 2023 11:48:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psQKY-0002v7-Da for qemu-devel@nongnu.org; Fri, 28 Apr 2023 11:48:20 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-235-ftOvIoz_NUS3AgpPVVTo0w-1; Fri, 28 Apr 2023 11:48:12 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A39F78828C2; Fri, 28 Apr 2023 15:48:11 +0000 (UTC) Received: from localhost (unknown [10.39.208.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B26314171B6; Fri, 28 Apr 2023 15:48:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682696897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L9RSoDPiCXXsMmvL2LThIxX9RAO9GG2JmdxDzJhNzK4=; b=FuqdnLJdE56D2VYQlgwls2Ztlvmze+Ujn/hvog9JhslqEEC3vBvohRRz0uNSJ/ukxLVmHE 2rgmwVQIA4oXYJliYx5I37BycemVKBbaEU0jpfkSKigjzHxuQSH8+KlZU2HluXOypbIJbC ilsK46tTXkJGng61kZX8wj8FCqJxkjY= X-MC-Unique: ftOvIoz_NUS3AgpPVVTo0w-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann Subject: [PATCH] ui: return NULL when getting cursor without a console Date: Fri, 28 Apr 2023 19:48:06 +0400 Message-Id: <20230428154807.2143652-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682696972845100001 From: Marc-Andr=C3=A9 Lureau VNC may try to get the current cursor even when there are no consoles and crashes. Simple reproducer is qemu with -nodefaults. Fixes: (again) https://gitlab.com/qemu-project/qemu/-/issues/1548 Fixes: commit 385ac97f8 ("ui: keep current cursor with QemuConsole") Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- ui/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/console.c b/ui/console.c index cbd60cc473..aefa43a1a4 100644 --- a/ui/console.c +++ b/ui/console.c @@ -2341,7 +2341,7 @@ QEMUCursor *qemu_console_get_cursor(QemuConsole *con) if (con =3D=3D NULL) { con =3D active_console; } - return con->cursor; + return con ? con->cursor : NULL; } =20 bool qemu_console_is_visible(QemuConsole *con) --=20 2.40.0