From nobody Sat Apr 11 13:56:05 2026 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1775849132; cv=none; d=zohomail.com; s=zohoarc; b=LyzKiEKEBaJRuq+Z+HglDhE0uJ9/v/zXjCXlAuKISjxVFCkUhhfhUmHm/rKOgnj3O9km8GI+TrvbhU3qzNRm9GjXVUX5MvkNEZYlcuTvovRrWqqTSRNzxM0U0T982/I/oLUp0kbKM4useTNgb2kQHm//UHkEF83BdgaHC57ZU6Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775849132; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4kWlbYarbpq8q7vX6x2MmnM15GIOhf9S8XQMmsXaO9s=; b=XGs3+ZeegYrrc9y2Ky0cDS5Vf+4dpjtpkCjzHqwIWG2J3cORaggKtce/9LY4P4e28IOKell/XwYJn0mxZ/g6nNWUxIB6hvCNY3s+MPGFHVb48O9QFWEtNlDOR/sHG5wSj8vvYv/59bNM6Cf7k7FzGY7IEt2mVeVhbF+GDKDRfEU= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775849132309592.4440006973708; Fri, 10 Apr 2026 12:25:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wBHRX-0005gm-Uz; Fri, 10 Apr 2026 15:23:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wBHRW-0005c3-06 for qemu-devel@nongnu.org; Fri, 10 Apr 2026 15:23:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wBHRU-00021j-ML for qemu-devel@nongnu.org; Fri, 10 Apr 2026 15:23:01 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-594-l0V46jO-MjK_dbROrs67Qg-1; Fri, 10 Apr 2026 15:22:57 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5335519560A7; Fri, 10 Apr 2026 19:22:56 +0000 (UTC) Received: from localhost (unknown [10.44.22.4]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F00A2195608E; Fri, 10 Apr 2026 19:22:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1775848979; 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: in-reply-to:in-reply-to:references:references; bh=4kWlbYarbpq8q7vX6x2MmnM15GIOhf9S8XQMmsXaO9s=; b=ViSOSgB46VTQ2vjXVYQn1EPr7yqUVsKGKaSvkYMAuJr6RuyTJFYGekpMwGfSq9C560rPnc uWugUJwdGPnUTeM/NvQwCJPhpXKc5qc3YqrIL0u1nYCCgcC7VCJhlbW4HzoG6Lc71lBIqt KyrV6GWc4xPT14Qk0LBfATwVM31NzKE= X-MC-Unique: l0V46jO-MjK_dbROrs67Qg-1 X-Mimecast-MFC-AGG-ID: l0V46jO-MjK_dbROrs67Qg_1775848976 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Fri, 10 Apr 2026 23:19:02 +0400 Subject: [PATCH v2 40/67] ui/vnc: assert preconditions instead of silently returning MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260410-qemu-vnc-v2-40-231416f76dc3@redhat.com> References: <20260410-qemu-vnc-v2-0-231416f76dc3@redhat.com> In-Reply-To: <20260410-qemu-vnc-v2-0-231416f76dc3@redhat.com> To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Developer-Signature: v=1; a=openpgp-sha256; l=1439; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=da7UZtFscHYGKLrYZuUkMO/YLUmJ4YfpeTA/WP9zdYE=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBp2U0Vydsrx4tA+tY+1afN3tj6rYtyIpSK7bgbm IT1fiD91F+JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCadlNFQAKCRDa6OEJdZac 5fyHD/4y5jUz4y1iEgQGRBG23K69av/mdL8wDipxaueP84smEmQfsl1dHylFCM2mkcAoqUPozQn mMXESWJ9p78HXK21oCYmRN3hPfBoLPho+afJJtuw4IB1TT7j7NYiMFF4lE9waR0ZLjOZ3ClJw5o 2DAF6T9O9IL9+Ekfh/qKLlTqzYWKBlTBJel6FDrvAR9NL07tQyOgSjn9JmGzuKn689TCE/3Nsvo nBL2U73PRbZSbY0Wjs9vBtdK/AS4ab8h+4sjsv1Jr7DTULDkzZMpMeTlqTP0VlZWH2t3sRz2WhM rUjVrINzOBfPadKFGTBjklt/G+KwHwPeQtkAEqmXE7RIc2FlnqV/PpiqapTnvKgaUrQWGk1arLx cU0GFVHOyfU0GSHPGpHh3tK3QRyfSTc56Qs7/0Xe77Xn8zfItpi88tDadGqkHPacxBkmFebycOr TC539gu3QxOx7Movx3c9CCbAGXDhUbsJl64dChTjrO8Bo6fkkHC9zpJXPmNBiKsAwiKIYpKuyQJ Gaa2rEPN4ma7JxwCUg4D3VP+iKwGcJjIEOethhMpLIqhjW2hW8vpBUWR2DkcG4akuqS4Nr9R9H1 bq0CG+8cBVbo6t8M9viuofLfQguk/aFlnp/fKL9gjzqRB8JCuCgXloBVafQMNcMthJGpr13EPg+ +dPKwbIgrFI5/Lw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 7 X-Spam_score: 0.7 X-Spam_bar: / X-Spam_report: (0.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.54, 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, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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: 1775849134662158500 Replace defensive NULL guards with assert() in vnc_display_close() and vnc_display_open(). These are internal functions whose callers guarantee non-NULL arguments, so a NULL value would indicate a programming error rather than a runtime condition. Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Marc-Andr=C3=A9 Lureau --- ui/vnc.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 9c8fe280bc9..3633fbeb6ce 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3465,9 +3465,7 @@ void vnc_display_init(const char *id, Error **errp) =20 static void vnc_display_close(VncDisplay *vd) { - if (!vd) { - return; - } + assert(vd); =20 if (vd->listener) { qio_net_listener_disconnect(vd->listener); @@ -4068,15 +4066,10 @@ void vnc_display_open(const char *id, Error **errp) const char *audiodev; const char *passwordSecret; =20 - if (!vd) { - error_setg(errp, "VNC display not active"); - return; - } - vnc_display_close(vd); + assert(vd); + assert(opts); =20 - if (!opts) { - return; - } + vnc_display_close(vd); =20 reverse =3D qemu_opt_get_bool(opts, "reverse", false); if (vnc_display_get_addresses(opts, reverse, &saddr_list, &wsaddr_list, --=20 2.53.0