From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 10 Mar 2021 15:38:48 +0000 (-0500)
Subject: qemu-timer: allow freeing a NULL timer
X-Git-Tag: v6.0.0-rc0~25^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b858f9998a9d59a9a7188f2c5c6ffb99eff6115;p=thirdparty%2Fqemu.git

qemu-timer: allow freeing a NULL timer

Since 5f8e93c3e2 ("util/qemu-timer: Make timer_free() imply timer_del()", 2021-01-08)
it is not possible anymore to pass a NULL pointer to timer_free().  Previously
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 <armbru@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/include/qemu/timer.h b/include/qemu/timer.h
index 5e76e3f8c22..301fa47b426 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);
+    }
 }
 
 /**