From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O7oC7-0007Xd-Lz for qemu-devel@nongnu.org; Fri, 30 Apr 2010 07:15:43 -0400 Received: from [140.186.70.92] (port=41829 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O7oC6-0007Wn-HS for qemu-devel@nongnu.org; Fri, 30 Apr 2010 07:15:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O7oC4-0007UJ-UT for qemu-devel@nongnu.org; Fri, 30 Apr 2010 07:15:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35932) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O7oC4-0007U8-Mp for qemu-devel@nongnu.org; Fri, 30 Apr 2010 07:15:40 -0400 From: Amit Shah Date: Fri, 30 Apr 2010 16:43:55 +0530 Message-Id: <1272626035-14416-1-git-send-email-amit.shah@redhat.com> Subject: [Qemu-devel] [PATCH] virtio-serial: Fix check for 'assert'; prevent NULL derefs List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Amit Shah , qemu list , Juan Quintela In the flush_queued_data() function, we expect port to be valid. Assert only for port and not port || discard. Reported-by: Juan Quintela Signed-off-by: Amit Shah --- hw/virtio-serial-bus.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c index 97694d5..3ce95e8 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); } -- 1.6.2.5