From owner-svn-src-stable@FreeBSD.ORG  Thu Mar 19 16:55:42 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BADC41065709;
	Thu, 19 Mar 2009 16:55:42 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A5FCF8FC22;
	Thu, 19 Mar 2009 16:55:42 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2JGtgwa069759;
	Thu, 19 Mar 2009 16:55:42 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2JGtgYl069758;
	Thu, 19 Mar 2009 16:55:42 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200903191655.n2JGtgYl069758@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 19 Mar 2009 16:55:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190085 - in stable/6/sys: . boot/i386/libi386
	contrib/pf dev/cxgb
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Mar 2009 16:55:45 -0000

Author: jhb
Date: Thu Mar 19 16:55:42 2009
New Revision: 190085
URL: http://svn.freebsd.org/changeset/base/190085

Log:
  MFC: Fix uninitialized pointer dereference.

Modified:
  stable/6/sys/   (props changed)
  stable/6/sys/boot/i386/libi386/devicename.c
  stable/6/sys/contrib/pf/   (props changed)
  stable/6/sys/dev/cxgb/   (props changed)

Modified: stable/6/sys/boot/i386/libi386/devicename.c
==============================================================================
--- stable/6/sys/boot/i386/libi386/devicename.c	Thu Mar 19 16:55:26 2009	(r190084)
+++ stable/6/sys/boot/i386/libi386/devicename.c	Thu Mar 19 16:55:42 2009	(r190085)
@@ -150,6 +150,8 @@ i386_parsedev(struct i386_devdesc **dev,
 		    cp++;
 		}
 	    }
+	} else {
+		cp = np;
 	}
 	if (*cp && (*cp != ':')) {
 	    err = EINVAL;
@@ -173,6 +175,8 @@ i386_parsedev(struct i386_devdesc **dev,
 		err = EUNIT;
 		goto fail;
 	    }
+	} else {
+		cp = np;
 	}
 	if (*cp && (*cp != ':')) {
 	    err = EINVAL;