From nobody Sun May 19 07:16:22 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=1615391261; cv=none; d=zohomail.com; s=zohoarc; b=QYIiUStY007pCbqQTbOvxbMhlJ5yaSzOLZlXIo/l6HH+1gcNk1zsTsAyjJ35l1zOwvhBaerw+O3QndFDoHIsANnFIIg9aDGlodJSOxdnFkOzuxiWdXgN5/7dKV2uyRtiXv2CEPMxi8ysPaHUxxbDR+jMWTNBVdgJ+rF3KsA99a0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615391261; 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=d/N0VhDL2yGMq6q/W3SJVxwvbgNCHvojYF7AnakoP9c=; b=TxRgtEkVLEccDmM0F37tH4Wnh7VmUvHWB0Yiowp66IbxlNsWXoB7bCK7iV1ytK0HLYAZVio+Lpz8XmkHlEHPeqqeadaZg2ByuZeR0redZi7dMIpmlXMwzYQ6m76EIG/ndIcnRBfyLLkaSaMnXXiPPQKDB5mnat5NVVwZ1XkFPJo= 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 1615391261093732.5623939443288; Wed, 10 Mar 2021 07:47:41 -0800 (PST) Received: from localhost ([::1]:49160 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK13k-0007EG-1B for importer@patchew.org; Wed, 10 Mar 2021 10:47:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK11l-00065W-8M for qemu-devel@nongnu.org; Wed, 10 Mar 2021 10:45:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:26124) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lK11g-0004G8-7k for qemu-devel@nongnu.org; Wed, 10 Mar 2021 10:45:37 -0500 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-486-cTB5GehgNsac8kCZmz_Imw-1; Wed, 10 Mar 2021 10:45:29 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 044C157; Wed, 10 Mar 2021 15:45:28 +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 A43F1196E3; Wed, 10 Mar 2021 15:45:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615391130; 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=d/N0VhDL2yGMq6q/W3SJVxwvbgNCHvojYF7AnakoP9c=; b=YQR9A7LZaR4IlKM83qjxQpLXgGFI2HIdnnFm/5Oy0j5tc4/Bia9Tm010HwV/iE+qRXPy+h Y/j7QHwHAd2o4+0qRIP4pMcKDvXKORpPjyAVHM1Hw5DjpjdbQG4kV1eCnZDAlUKHE40F1P BcxPZl1PX9hZm1lz5tbM43mflAKDKYA= X-MC-Unique: cTB5GehgNsac8kCZmz_Imw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] qemu-timer: allow freeing a NULL timer Date: Wed, 10 Mar 2021 10:45:26 -0500 Message-Id: <20210310154526.463850-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.243, 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: peter.maydell@linaro.org, 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefano Garzarella --- 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 1678238384..88ef114689 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