| commit | d45ff124e3912dd2734856c91f5c88c3eb6b9f9f | [log] [tgz] |
|---|---|---|
| author | Nathan Ridge <zeratul976@hotmail.com> | Fri Jan 20 01:45:39 2017 -0500 |
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | Sat Jan 21 16:15:52 2017 -0500 |
| tree | 2300e37e5e8e4d4dde51488756be9b11a8cf1386 | |
| parent | 2726670258bed3a77e416a7e68ac86a030bd771a [diff] |
Bug 510722 - Handle a null AST in ExpandSelectionJob and ControlFlowGraphView Change-Id: Iafd1b9a32833fb67554902d13955023c149a132e
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 11d393d..db2ec90 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 @@ 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 13f1aca..a0c40be 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 @@ @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; } }