From 68af5b5191593223709680b89951dfc84a32bee8 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 5 Dec 2011 13:43:34 +0000 Subject: [PATCH] qemu_timer_pending/qemu_get_timer: cope with NULL timers qemu_timer_pending and qemu_get_timer: don't crash if the timer passed as an argument is NULL. [ Fixes regression: 13b06e700528 broke save/restore on Xen. -iwj ] Signed-off-by: Stefano Stabellini --- vl.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/vl.c b/vl.c index f07a6592a..f3b3d02ab 100644 --- a/vl.c +++ b/vl.c @@ -1201,6 +1201,10 @@ void qemu_mod_timer(QEMUTimer *ts, int64_t expire_time) int qemu_timer_pending(QEMUTimer *ts) { QEMUTimer *t; + + if (ts == NULL) + return 0; + for(t = active_timers[ts->clock->type]; t != NULL; t = t->next) { if (t == ts) return 1; @@ -1272,6 +1276,9 @@ void qemu_get_timer(QEMUFile *f, QEMUTimer *ts) { uint64_t expire_time; + if (ts == NULL) + return; + expire_time = qemu_get_be64(f); if (expire_time != -1) { qemu_mod_timer(ts, expire_time); -- 2.39.5