diff options
| author | Nathan Ridge | 2017-04-28 01:27:42 +0000 |
|---|---|---|
| committer | Nathan Ridge | 2017-05-06 03:59:58 +0000 |
| commit | d4841209b5e16f429037fdb601c54554d3c21cb5 (patch) | |
| tree | 7f1b1473e2d8d8b37f3ecd701d164190983878d8 /core/org.eclipse.cdt.ui/src | |
| parent | 121d748c2c71f9d037a81918d7e058e1922f4ba9 (diff) | |
| download | org.eclipse.cdt-d4841209b5e16f429037fdb601c54554d3c21cb5.tar.gz org.eclipse.cdt-d4841209b5e16f429037fdb601c54554d3c21cb5.tar.xz org.eclipse.cdt-d4841209b5e16f429037fdb601c54554d3c21cb5.zip | |
Bug 515343 - NPE in NamespaceHelper.checkFileNameAndLocation()
Change-Id: Id281e1cd8ec189e214dcfeffb6d238b66c87050e
Diffstat (limited to 'core/org.eclipse.cdt.ui/src')
| -rw-r--r-- | core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NamespaceHelper.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NamespaceHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NamespaceHelper.java index a595ca8fbfb..c8db2fbf389 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NamespaceHelper.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NamespaceHelper.java @@ -18,6 +18,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier; +import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTNode.CopyStyle; @@ -79,7 +80,11 @@ public class NamespaceHelper { } private static boolean checkFileNameAndLocation(final IPath path, final int offset, IASTNode namespace) { - boolean fileNameOk = namespace.getFileLocation().getFileName().endsWith(path.toOSString()); + IASTFileLocation fileLoc = namespace.getFileLocation(); + if (fileLoc == null) { + return false; + } + boolean fileNameOk = fileLoc.getFileName().endsWith(path.toOSString()); if (!fileNameOk) { return false; } |