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) {