From patchwork Wed Jun 12 21:41:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 250924 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 847A12C0098 for ; Thu, 13 Jun 2013 09:13:19 +1000 (EST) Received: from localhost ([::1]:47937 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmswM-0002yI-JJ for incoming@patchwork.ozlabs.org; Wed, 12 Jun 2013 17:50:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmsrV-0006ha-Cr for qemu-devel@nongnu.org; Wed, 12 Jun 2013 17:45:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UmsrU-0001BS-0N for qemu-devel@nongnu.org; Wed, 12 Jun 2013 17:45:49 -0400 Received: from mail-ie0-x236.google.com ([2607:f8b0:4001:c03::236]:62438) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmsrT-0001BG-S6; Wed, 12 Jun 2013 17:45:47 -0400 Received: by mail-ie0-f182.google.com with SMTP id s9so10042658iec.27 for ; Wed, 12 Jun 2013 14:45:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=fcb+9aZJgTkmKH+MdA/K3ykwXPSj7q1I0uq7MwvwkCc=; b=MjcekIRBiEAe5bt68G0OCVtAg5b2tqbJ3qogpLOv7IVOzJWA9qp3SeZ2Y9AjPe++3U 2MXY5a4IFIdcUK+BA4Y/PraxDl2yKfZXyJw3xNEzFsU4371UJe/A0qivJ6dubLXpR7up VneYqPKE90mgW0z5pnCMjMCMJrQNeETQsuppkWqnfkRi3TSQIczxfqNSArbf+V31KRvS KLnwAMBYsa5Sti4tZcz5zf3xoPsKYkLZQWDsxBBJKYeBYtmH9eCoxM+e0Xp+5tsx6z21 hZbMfKO75Qe7gGf5Ow8CfnYc9YzUux6ugtMyrrTW72bW6CXPjg2eGDjh62auDxwWzCLh HTvQ== X-Received: by 10.50.29.107 with SMTP id j11mr4260760igh.105.1371073547307; Wed, 12 Jun 2013 14:45:47 -0700 (PDT) Received: from localhost ([32.97.110.51]) by mx.google.com with ESMTPSA id j3sm20284136igv.4.2013.06.12.14.45.46 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 12 Jun 2013 14:45:46 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Wed, 12 Jun 2013 16:41:27 -0500 Message-Id: <1371073298-14519-16-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1371073298-14519-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1371073298-14519-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4001:c03::236 Cc: qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 15/26] do not check pointers after dereferencing them X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Paolo Bonzini Two instances, both spotted by Coverity. In one, two blocks were swapped. In the other, the check is not needed anymore. Cc: qemu-stable@nongnu.org Cc: qemu-trivial@nongnu.org Signed-off-by: Paolo Bonzini Reviewed-by: Eric Blake Signed-off-by: Michael Tokarev (cherry picked from commit a4cc73d629d43c8a4d171d043ff229a959df3ca6) Signed-off-by: Michael Roth --- monitor.c | 2 +- savevm.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/monitor.c b/monitor.c index 62aaebe..dee980c 100644 --- a/monitor.c +++ b/monitor.c @@ -281,7 +281,7 @@ void monitor_flush(Monitor *mon) buf = qstring_get_str(mon->outbuf); len = qstring_get_length(mon->outbuf); - if (mon && len && !mon->mux_out) { + if (len && !mon->mux_out) { rc = qemu_chr_fe_write(mon->chr, (const uint8_t *) buf, len); if (rc == len) { /* all flushed */ diff --git a/savevm.c b/savevm.c index 31dcce9..4e0fab6 100644 --- a/savevm.c +++ b/savevm.c @@ -322,13 +322,13 @@ QEMUFile *qemu_popen_cmd(const char *command, const char *mode) FILE *stdio_file; QEMUFileStdio *s; - stdio_file = popen(command, mode); - if (stdio_file == NULL) { + if (mode == NULL || (mode[0] != 'r' && mode[0] != 'w') || mode[1] != 0) { + fprintf(stderr, "qemu_popen: Argument validity check failed\n"); return NULL; } - if (mode == NULL || (mode[0] != 'r' && mode[0] != 'w') || mode[1] != 0) { - fprintf(stderr, "qemu_popen: Argument validity check failed\n"); + stdio_file = popen(command, mode); + if (stdio_file == NULL) { return NULL; }