diff options
| author | Nathan Ridge | 2017-01-20 06:45:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2017-01-28 19:42:11 +0000 |
| commit | 1703112285e19de1ad66989f40b7c16146e36390 (patch) | |
| tree | 2a2fc45a4d5d706459fb047c46bf2ae28c6a926a | |
| parent | 0dd5bb0f651ea89bcfcf742310c4ef133b9fb99c (diff) | |
| download | org.eclipse.cdt-1703112285e19de1ad66989f40b7c16146e36390.tar.gz org.eclipse.cdt-1703112285e19de1ad66989f40b7c16146e36390.tar.xz org.eclipse.cdt-1703112285e19de1ad66989f40b7c16146e36390.zip | |
Bug 510722 - Handle a null AST in ExpandSelectionJob and ControlFlowGraphView
Change-Id: Iafd1b9a32833fb67554902d13955023c149a132e
(cherry picked from commit d45ff124e3912dd2734856c91f5c88c3eb6b9f9f)
2 files changed, 7 insertions, 1 deletions
diff --git a/codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/views/ControlFlowGraphView.java b/codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/views/ControlFlowGraphView.java index 11d393da2cd..db2ec904dea 100644 --- a/codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/views/ControlFlowGraphView.java +++ b/codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/views/ControlFlowGraphView.java @@ -300,6 +300,9 @@ public class ControlFlowGraphView extends ViewPart { Job job = new SharedASTJob("Building Control Flow Grath", tu) { @Override public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) throws CoreException { + if (ast == null) { + return Status.CANCEL_STATUS; + } processAst(ast); return Status.OK_STATUS; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectionAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectionAction.java index 13f1aca43d9..a0c40bef3af 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectionAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectionAction.java @@ -56,7 +56,10 @@ public abstract class StructureSelectionAction extends TextEditorAction { @Override public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) throws CoreException { - newSourceRange = doExpand(ast,currentSourceRange); + if (ast == null) { + return Status.CANCEL_STATUS; + } + newSourceRange = doExpand(ast, currentSourceRange); return Status.OK_STATUS; } } |