From 57fbe42664ddd5a05f7e9b685e97afb07c344dc2 Mon Sep 17 00:00:00 2001 From: Nathan Ridge Date: Tue, 16 Dec 2014 23:08:23 -0500 Subject: [PATCH] Bug 429534 - NPE in CElementHyperlinkDetector.detectHyperlinks() Change-Id: I9572985aa6585a47d5230adad813fdb6639748bf Signed-off-by: Nathan Ridge Reviewed-on: https://git.eclipse.org/r/38394 Tested-by: Hudson CI Reviewed-by: Sergey Prigogin Tested-by: Sergey Prigogin --- .../cdt/internal/ui/editor/CElementHyperlinkDetector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java index 9e9bfad9d37..90254838110 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java @@ -142,7 +142,7 @@ public class CElementHyperlinkDetector extends AbstractHyperlinkDetector { scanner.setSource(document.get().toCharArray()); scanner.setCurrentPosition(findPreprocessorDirectiveStart(document, region.getOffset())); Token token = scanner.nextToken(); - if (token.getType() == Token.tPREPROCESSOR_INCLUDE) { + if (token != null && token.getType() == Token.tPREPROCESSOR_INCLUDE) { int endPos = token.getOffset() + token.getLength(); // Trim trailing whitespace. while (Character.isWhitespace(document.getChar(--endPos))) {