From owner-svn-src-projects@FreeBSD.ORG  Sat Aug  4 04:24:42 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id CB095106564A;
	Sat,  4 Aug 2012 04:24:42 +0000 (UTC)
	(envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B66738FC08;
	Sat,  4 Aug 2012 04:24:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q744OgUb008292;
	Sat, 4 Aug 2012 04:24:42 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q744OgHr008289;
	Sat, 4 Aug 2012 04:24:42 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201208040424.q744OgHr008289@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Sat, 4 Aug 2012 04:24:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239028 - projects/bhyve/usr.sbin/bhyve
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Aug 2012 04:24:42 -0000

Author: neel
Date: Sat Aug  4 04:24:41 2012
New Revision: 239028
URL: http://svn.freebsd.org/changeset/base/239028

Log:
  Check that 'opts' is actually not NULL before dereferencing it. It is expected
  that 'opts' will be NULL for the second serial port (-S <slot>,uart)

Modified:
  projects/bhyve/usr.sbin/bhyve/pci_uart.c

Modified: projects/bhyve/usr.sbin/bhyve/pci_uart.c
==============================================================================
--- projects/bhyve/usr.sbin/bhyve/pci_uart.c	Sat Aug  4 03:05:01 2012	(r239027)
+++ projects/bhyve/usr.sbin/bhyve/pci_uart.c	Sat Aug  4 04:24:41 2012	(r239028)
@@ -580,7 +580,7 @@ pci_uart_init(struct vmctx *ctx, struct 
 	pci_emul_alloc_bar(pi, 0, bar, PCIBAR_IO, 8);
 	pci_lintr_request(pi, ivec);
 
-	if (!strcmp("stdio", opts) && !pci_uart_stdio) {
+	if (opts != NULL && !strcmp("stdio", opts) && !pci_uart_stdio) {
 		pci_uart_stdio = 1;
 		sc->stdio = 1;
 	}