From 95aa27858c89c7a0e0332296c736c4757d46f7a3 Mon Sep 17 00:00:00 2001 From: Nathan Ridge Date: Sat, 18 Jul 2015 02:24:04 -0400 Subject: [PATCH] Bug 389191 - NPE in CDocHover.getHoverInfo() Change-Id: Ied3f42206a5af49577bc487b3c40a1b87a02cd02 Signed-off-by: Nathan Ridge --- .../eclipse/cdt/internal/ui/text/c/hover/CDocHover.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CDocHover.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CDocHover.java index 2361fb9ea21..6ba993ce578 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CDocHover.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CDocHover.java @@ -12,6 +12,7 @@ package org.eclipse.cdt.internal.ui.text.c.hover; import org.eclipse.core.resources.IProject; +import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.Region; @@ -46,7 +47,11 @@ public class CDocHover extends AbstractCEditorTextHover { if (getEditor() == null) return null; try { - expression = viewer.getDocument().get(region.getOffset(), region.getLength()); + IDocument document = viewer.getDocument(); + if (document == null) { + return null; + } + expression = document.get(region.getOffset(), region.getLength()); expression = expression.trim(); if (expression.isEmpty()) return null;