From cf9917029674a63f8edaca05aee634ed537e77f9 Mon Sep 17 00:00:00 2001
From: Nathan Ridge <zeratul976@hotmail.com>
Date: Mon, 24 Sep 2018 21:20:30 -0400
Subject: [PATCH] Bug 539145 - Avoid NPE in
 CaseBreakQuickFixFallthroughAttribute.validPositionForFallthrough()

Change-Id: I8a53691f91411bf88f95112d99c1967b1238515a
---
 .../ui/quickfix/CaseBreakQuickFixFallthroughAttribute.java      | 2 ++
 1 file changed, 2 insertions(+)

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