diff options
| author | Nathan Ridge | 2018-09-25 01:20:30 +0000 |
|---|---|---|
| committer | Nathan Ridge | 2018-09-27 17:31:34 +0000 |
| commit | 45a30f5967fb31e4b2498ee20e0db4ba2443b1f2 (patch) | |
| tree | 4d46b56bbdd791cb441569dcc0394ee5a426720c | |
| parent | acca2b3b6e1bea9fe9666683b0e69d77a8f8a8ed (diff) | |
| download | org.eclipse.cdt-45a30f5967fb31e4b2498ee20e0db4ba2443b1f2.tar.gz org.eclipse.cdt-45a30f5967fb31e4b2498ee20e0db4ba2443b1f2.tar.xz org.eclipse.cdt-45a30f5967fb31e4b2498ee20e0db4ba2443b1f2.zip | |
Bug 539145 - Avoid NPE in CaseBreakQuickFixFallthroughAttribute.validPositionForFallthrough()
Change-Id: I8a53691f91411bf88f95112d99c1967b1238515a
| -rw-r--r-- | codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixFallthroughAttribute.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixFallthroughAttribute.java b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixFallthroughAttribute.java index 1642ae0b96b..d33ff1750f7 100644 --- a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixFallthroughAttribute.java +++ b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixFallthroughAttribute.java @@ -61,6 +61,8 @@ public class CaseBreakQuickFixFallthroughAttribute extends AbstractCaseBreakQuic try { IASTTranslationUnit ast = CModelUtil.toWorkingCopy(tu).getAST(null, ITranslationUnit.AST_SKIP_INDEXED_HEADERS); IASTStatement beforeCaseEnd = getStmtBeforeCaseEnd(marker, ast); + if (beforeCaseEnd == null) + return false; if (getNextStatement(beforeCaseEnd) == null) return false; } catch (CoreException | BadLocationException e) { |