From: Amit Shah <amit.shah@redhat.com>
Date: Fri, 30 Apr 2010 11:13:55 +0000 (+0530)
Subject: virtio-serial: Fix check for 'assert'; prevent NULL derefs
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a1c5975270f2335e1d7129c084a6e562d7b99bdd;p=qemu.git

virtio-serial: Fix check for 'assert'; prevent NULL derefs

In the flush_queued_data() function, we expect port to be valid. Assert
only for port and not port || discard.

Reported-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c
index 97694d5216..3ce95e8f1e 100644
--- a/hw/virtio-serial-bus.c
+++ b/hw/virtio-serial-bus.c
@@ -137,7 +137,7 @@ static void do_flush_queued_data(VirtIOSerialPort *port, VirtQueue *vq,
 
 static void flush_queued_data(VirtIOSerialPort *port, bool discard)
 {
-    assert(port || discard);
+    assert(port);
 
     do_flush_queued_data(port, port->ovq, &port->vser->vdev, discard);
 }