From d598331c81b730a071e85b40b125dd6db9556e3e Mon Sep 17 00:00:00 2001 From: Nathan Ridge Date: Thu, 22 Mar 2018 18:46:08 -0400 Subject: [PATCH] Bug 532684 - NPE in PDOMMacroReferenceName constructor Change-Id: Iea6200203350591927f505213facc9224243cc65 --- .../cdt/internal/core/pdom/dom/PDOMMacroReferenceName.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroReferenceName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroReferenceName.java index 65a11e802a9..ecddd3214ec 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroReferenceName.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroReferenceName.java @@ -56,8 +56,8 @@ public final class PDOMMacroReferenceName implements IIndexFragmentName { // Record our location in the file IASTFileLocation fileloc = name.getFileLocation(); - db.putInt(record + NODE_OFFSET_OFFSET, fileloc.getNodeOffset()); - db.putShort(record + NODE_LENGTH_OFFSET, (short) fileloc.getNodeLength()); + db.putInt(record + NODE_OFFSET_OFFSET, fileloc != null ? fileloc.getNodeOffset() : 0); + db.putShort(record + NODE_LENGTH_OFFSET, fileloc != null ? (short) fileloc.getNodeLength() : 0); container.addReference(this); if (caller != null) {