mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2025-02-21 07:54:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Moved check for null object in AttachObject

Browse Source 
date	99.10.01.21.17.00;	author rmoore1;	state Exp;
This commit is contained in:
aystarik 2005-06-29 18:31:02 +00:00
parent 4ee45705b4
commit 44f529ad8f
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/components/namespace/nsobject.c
View File

@ -210,8 +210,18 @@ NsAttachObject (
Flags = ThisEntry->Flags;
Flags &= ~NTE_AML_ATTACHMENT;
/* If null object, we will just install it */
if (!Object)
{
ObjDesc = NULL;
ObjType = ACPI_TYPE_Any;
}
/*
* If the object is an NTE with an attached object, we will use that object
* If the object is an NTE with an attached object,
* we will use that (attached) object
*/
if (VALID_DESCRIPTOR_TYPE (Object, DESC_TYPE_NTE) &&
@ -245,17 +255,15 @@ NsAttachObject (
ObjDesc = (ACPI_OBJECT_INTERNAL *) Object;
/* Set the type if given, or if it can be discerned */
/* If a valid type (non-ANY) was given, just use it */
if (ACPI_TYPE_Any != Type)
{
ObjType = (ACPI_OBJECT_TYPE) Type;
}
else if (!Object)
{
ObjType = ACPI_TYPE_Any;
}
/* Type is TYPE_Any, we must try to determinte the actual type of the object */
/*
* Check if value points into the AML code