summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Moore <Robert.Moore@intel.com>2012-10-31 13:42:35 -0700
committerRobert Moore <Robert.Moore@intel.com>2012-10-31 13:42:35 -0700
commit9435ca866fb306371f5ef88cbe6d3f556fd17401 (patch)
treea04473564faa07525c89d72d73bddd4507acd647
parentf5738afe379ce4dd137f73a2fa0f679c3d877684 (diff)
downloadacpica-9435ca866fb306371f5ef88cbe6d3f556fd17401.tar.gz
Disassembler: Fix for external declaration generation
Fixes a problem where an incorrect pathname could be generated for an external declaration if the original reference to the object includes leading carats.
-rw-r--r--source/common/dmextern.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/source/common/dmextern.c b/source/common/dmextern.c
index 8256b65f7..d0396fb5a 100644
--- a/source/common/dmextern.c
+++ b/source/common/dmextern.c
@@ -227,8 +227,14 @@ AcpiDmNormalizeParentPrefix (
ACPI_SIZE Length;
- /* Search upwards in the parse tree until we reach a namespace node */
+ if (!Op)
+ {
+ return (NULL);
+ }
+
+ /* Search upwards in the parse tree until we reach the next namespace node */
+ Op = Op->Common.Parent;
while (Op)
{
if (Op->Common.Node)