diff options
| author | Paolo Bonzini | 2021-03-10 16:38:48 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2021-03-16 19:30:30 +0100 |
| commit | 8b858f9998a9d59a9a7188f2c5c6ffb99eff6115 (patch) | |
| tree | ff930400117fbe81024a68374bc5719e75f35d25 /include/qemu | |
| parent | hw/i8254: fix vmstate load (diff) | |
| download | qemu-8b858f9998a9d59a9a7188f2c5c6ffb99eff6115.tar.gz qemu-8b858f9998a9d59a9a7188f2c5c6ffb99eff6115.tar.xz qemu-8b858f9998a9d59a9a7188f2c5c6ffb99eff6115.zip | |
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>
Diffstat (limited to 'include/qemu')
| -rw-r--r-- | include/qemu/timer.h | 6 |
1 files 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); + } } /** |