summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorStefan Weil <sw@weilnetz.de>2012-08-17 15:50:44 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2012-08-31 10:05:22 -0500
commit8bd6b06d7b718b3e595aab279699ef3651ce2e48 (patch)
tree893c4c89180f45fa9a5798b25b0e5540fd39cbfe
parent23aec6005af30e29180496b434edcc51660ce94e (diff)
downloadfocaccia-qemu-8bd6b06d7b718b3e595aab279699ef3651ce2e48.tar.gz
focaccia-qemu-8bd6b06d7b718b3e595aab279699ef3651ce2e48.zip
console: Fix warning from clang (and potential crash)
ccc-analyzer reports this warning:

console.c:1090:29: warning: Dereference of null pointer
        if (active_console->cursor_timer) {
                            ^

Function console_select allows active_console to be NULL,
but would crash when accessing cursor_timer. Fix this.

Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--console.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/console.c b/console.c
index 4525cc70b8..f5e8814792 100644
--- a/console.c
+++ b/console.c
@@ -1087,7 +1087,7 @@ void console_select(unsigned int index)
     if (s) {
         DisplayState *ds = s->ds;
 
-        if (active_console->cursor_timer) {
+        if (active_console && active_console->cursor_timer) {
             qemu_del_timer(active_console->cursor_timer);
         }
         active_console = s;