svn commit: r212641 - stable/8/sys/dev/acpi_support

[Andriy Gapon]

Author: avg
Date: Wed Sep 15 08:18:20 2010
New Revision: 212641
URL: http://svn.freebsd.org/changeset/base/212641

Log:
  MFC r209055: Fix a possible dereference of null pointer.
  
  Original commit by jkim.

Modified:
  stable/8/sys/dev/acpi_support/acpi_hp.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/acpi_support/acpi_hp.c
==============================================================================
--- stable/8/sys/dev/acpi_support/acpi_hp.c	Wed Sep 15 08:07:58 2010	(r212640)
+++ stable/8/sys/dev/acpi_support/acpi_hp.c	Wed Sep 15 08:18:20 2010	(r212641)
@@ -905,7 +905,7 @@ acpi_hp_get_cmi_block(device_t wmi_dev, 
 		return (-EINVAL);
 	}
 	obj = out.Pointer;
-	if (!obj && obj->Type != ACPI_TYPE_PACKAGE) {
+	if (!obj || obj->Type != ACPI_TYPE_PACKAGE) {
 		acpi_hp_free_buffer(&out);
 		return (-EINVAL);
 	}