From nobody Mon Feb 9 17:59:56 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615929880; cv=none; d=zohomail.com; s=zohoarc; b=PzjkD5X/zDpxjgacF8ZV4EmFB4s6gxuU0K5vE3BQxlrc7fC5/RdIarpolyUN8D3Op9pXQF8/gLowfR60rl02JzufwScfZO0Q7mkE7zxnfccr0+Cpbk8DctVC6aD8Mdk640gufN/c0kV+qOvMe8YWivu5+UmcijHWKDYmbGStGF0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615929880; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EZtJYDQX+XcSW7/XY3Jkdf8eH7R1x9pqkUBgdJY7Deg=; b=iiUA3u3HCxrC2FvzD1qo0l8lHuvEZfAqdhlO43Rzjmjx0UwLkdQhnneTcZkMpw0bKkixC9ECjhde2lcRQF+EMGgAFO5O4wlFDW0oHPimA4/75aH6B6mHUfebwvgW+qp7/AtTpQaSWlbKa8l6sE4c3FHVxCD/etri6s898O79VRI= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615929880146478.1062589000437; Tue, 16 Mar 2021 14:24:40 -0700 (PDT) Received: from localhost ([::1]:37154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMHB9-0000pa-65 for importer@patchew.org; Tue, 16 Mar 2021 17:24:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52060) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMH2k-0005jZ-9I for qemu-devel@nongnu.org; Tue, 16 Mar 2021 17:15:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:36748) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lMH2e-0003Xb-PI for qemu-devel@nongnu.org; Tue, 16 Mar 2021 17:15:58 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-312-nqx6CsSrM3SuHryG2Jvf5w-1; Tue, 16 Mar 2021 17:15:50 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3B9B9100C61B for ; Tue, 16 Mar 2021 21:15:49 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE4A91378D; Tue, 16 Mar 2021 21:15:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615929352; 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=EZtJYDQX+XcSW7/XY3Jkdf8eH7R1x9pqkUBgdJY7Deg=; b=f+ijuGCyUorJspoTeQIjRtqSpoHNDbrvIQVfdjKFe7kIFJDejgv9gl2UcHD/2ZQryMM81P FfebFii3tzr5fyQ6NE6YZVbFQCZKtvsKh6iv3dTNUFt1Bo7mKUTVPga6v37zn+ncHTElP7 /hd0Ow/uG5tee79H1h+xymX3WV7FGVU= X-MC-Unique: nqx6CsSrM3SuHryG2Jvf5w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 16/16] qemu-timer: allow freeing a NULL timer Date: Tue, 16 Mar 2021 17:15:31 -0400 Message-Id: <20210316211531.1649909-17-pbonzini@redhat.com> In-Reply-To: <20210316211531.1649909-1-pbonzini@redhat.com> References: <20210316211531.1649909-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Since 5f8e93c3e2 ("util/qemu-timer: Make timer_free() imply timer_del()", 2= 021-01-08) it is not possible anymore to pass a NULL pointer to timer_free(). Previou= sly it would do nothing as it would simply pass NULL down to g_free(). Rectify this, which also fixes "-chardev braille" when there is no device. Reported-by: Markus Armbruster Signed-off-by: Paolo Bonzini --- include/qemu/timer.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/qemu/timer.h b/include/qemu/timer.h index 5e76e3f8c2..301fa47b42 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -629,8 +629,10 @@ void timer_del(QEMUTimer *ts); */ static inline void timer_free(QEMUTimer *ts) { - timer_del(ts); - g_free(ts); + if (ts) { + timer_del(ts); + g_free(ts); + } } =20 /** --=20 2.26.2