svn commit: r190084 - in stable/7/sys: . boot/i386/libi386 contrib/pf dev/ath/ath_hal dev/cxgb

[John Baldwin]

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

Log:
  MFC: Fix uninitialized pointer dereference.

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

Modified: stable/7/sys/boot/i386/libi386/devicename.c
==============================================================================
--- stable/7/sys/boot/i386/libi386/devicename.c	Thu Mar 19 16:44:37 2009	(r190083)
+++ stable/7/sys/boot/i386/libi386/devicename.c	Thu Mar 19 16:55:26 2009	(r190084)
@@ -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;