fixed null pointer exceptions in C++ builds (#476)

* fixed null pointer exceptions in C++ builds
HaxeCheckstyle · Oct 9, 2019 · b021d35 · b021d35
1 parent ae3b3a4
commit b021d35
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,7 +25,8 @@
 - Fixed Java regexp issue in IndentationCheck ([#468](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/468))
 - Fixed empty lines between types with conditionals ([#469](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/469))
 - Fixed empty lines before comments with conditionals ([#472](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/472))
-- Fixed EFunction changes in Haxe 4rc4
+- Fixed EFunction changes in Haxe 4rc4 ([#474](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/474))
+- Fixed null pointer references for C++ ([#476](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/476))
 - Changed return block indentation [#453](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/453)
 - Changed applied formatter [#461](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/461)
 - Refactored coverage reporting [#462](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/462)

diff --git a/src/checkstyle/checks/Check.hx b/src/checkstyle/checks/Check.hx
@@ -90,6 +90,7 @@ class Check {
 	}
 
 	function forEachField(cb:Field -> ParentType -> Void) {
+		if (checker.ast == null) return;
 		if (checker.ast.decls == null) return;
 		for (td in checker.ast.decls) {
 			var fields:Array<Field> = switch (td.decl) {
@@ -134,6 +135,7 @@ class Check {
 	}
 
 	function isCharPosExtern(pos:Int):Bool {
+		if (checker.ast == null) return false;
 		if (checker.ast.decls == null) return false;
 		for (td in checker.ast.decls) {
 			switch (td.decl) {

diff --git a/src/checkstyle/checks/coding/AvoidInlineConditionalsCheck.hx b/src/checkstyle/checks/coding/AvoidInlineConditionalsCheck.hx
@@ -14,6 +14,7 @@ class AvoidInlineConditionalsCheck extends Check {
 	}
 
 	override function actualRun() {
+		if (checker.ast == null) return;
 		checker.ast.walkFile(function(e:Expr) {
 			if (isPosSuppressed(e.pos)) return;
 			switch (e.expr) {

diff --git a/src/checkstyle/checks/coding/DefaultComesLastCheck.hx b/src/checkstyle/checks/coding/DefaultComesLastCheck.hx
@@ -19,6 +19,7 @@ class DefaultComesLastCheck extends Check {
 
 		for (token in acceptableTokens) {
 			var tokens:Array<TokenTree> = token.filter([Kwd(KwdCase), Kwd(KwdDefault)], FIRST);
+			if (tokens.length <= 0) continue;
 			if (tokens[tokens.length - 1].is(Kwd(KwdDefault))) continue;
 
 			for (i in 0...tokens.length) {

diff --git a/src/checkstyle/checks/literal/ArrayLiteralCheck.hx b/src/checkstyle/checks/literal/ArrayLiteralCheck.hx
@@ -12,6 +12,7 @@ class ArrayLiteralCheck extends Check {
 	}
 
 	override function actualRun() {
+		if (checker.ast == null) return;
 		checker.ast.walkFile(function(e:Expr) {
 			switch (e.expr) {
 				case ENew({pack: [], name: "Array"}, _):

diff --git a/src/checkstyle/checks/literal/ERegLiteralCheck.hx b/src/checkstyle/checks/literal/ERegLiteralCheck.hx
@@ -12,6 +12,7 @@ class ERegLiteralCheck extends Check {
 	}
 
 	override function actualRun() {
+		if (checker.ast == null) return;
 		checker.ast.walkFile(function(e:Expr) {
 			if (isPosSuppressed(e.pos)) return;
 			switch (e.expr) {

diff --git a/src/checkstyle/checks/literal/HexadecimalLiteralCheck.hx b/src/checkstyle/checks/literal/HexadecimalLiteralCheck.hx
@@ -21,6 +21,7 @@ class HexadecimalLiteralCheck extends Check {
 	}
 
 	override function actualRun() {
+		if (checker.ast == null) return;
 		checker.ast.walkFile(function(e:Expr) {
 			switch (e.expr) {
 				case EConst(CInt(s)):

diff --git a/src/checkstyle/checks/naming/LocalVariableNameCheck.hx b/src/checkstyle/checks/naming/LocalVariableNameCheck.hx
@@ -13,6 +13,7 @@ class LocalVariableNameCheck extends NameCheckBase<String> {
 
 	override function actualRun() {
 		formatRE = new EReg(format, "");
+		if (checker.ast == null) return;
 		checker.ast.walkFile(function(e) {
 			switch (e.expr) {
 				case EVars(vars):

diff --git a/src/checkstyle/checks/naming/NameCheckBase.hx b/src/checkstyle/checks/naming/NameCheckBase.hx
@@ -40,6 +40,7 @@ class NameCheckBase<T> extends Check {
 	}
 
 	function checkClassFields() {
+		if (checker.ast == null) return;
 		for (td in checker.ast.decls) {
 			switch (td.decl) {
 				case EClass(d):

diff --git a/src/checkstyle/checks/size/FileLengthCheck.hx b/src/checkstyle/checks/size/FileLengthCheck.hx
@@ -22,6 +22,7 @@ class FileLengthCheck extends Check {
 	}
 
 	override function actualRun() {
+		if (checker.ast == null) return;
 		for (td in checker.ast.decls) {
 			switch (td.decl) {
 				case EClass(d):

diff --git a/src/checkstyle/checks/type/AnonymousCheck.hx b/src/checkstyle/checks/type/AnonymousCheck.hx
@@ -27,6 +27,7 @@ class AnonymousCheck extends Check {
 	}
 
 	function checkLocalVars() {
+		if (checker.ast == null) return;
 		checker.ast.walkFile(function(e) {
 			switch (e.expr) {
 				case EVars(vars):

diff --git a/src/checkstyle/checks/type/DynamicCheck.hx b/src/checkstyle/checks/type/DynamicCheck.hx
@@ -15,6 +15,7 @@ class DynamicCheck extends Check {
 	}
 
 	override function actualRun() {
+		if (checker.ast == null) return;
 		ComplexTypeUtils.walkFile(checker.ast, callbackComplexType);
 	}
 

diff --git a/src/checkstyle/checks/type/ReturnCheck.hx b/src/checkstyle/checks/type/ReturnCheck.hx
@@ -62,6 +62,7 @@ class ReturnCheck extends Check {
 	}
 
 	function checkInlineFunctions() {
+		if (checker.ast == null) return;
 		checker.ast.walkFile(function(e) {
 			switch (e.expr) {
 				#if (haxe_ver < 4.0)

diff --git a/src/checkstyle/checks/whitespace/ArrayAccessCheck.hx b/src/checkstyle/checks/whitespace/ArrayAccessCheck.hx
@@ -26,6 +26,7 @@ class ArrayAccessCheck extends Check {
 	override function actualRun() {
 		var lastExpr = null;
 
+		if (checker.ast == null) return;
 		checker.ast.walkFile(function(e:Expr) {
 			if (lastExpr == null) {
 				lastExpr = e;

diff --git a/src/checkstyle/checks/whitespace/ExtendedEmptyLinesCheck.hx b/src/checkstyle/checks/whitespace/ExtendedEmptyLinesCheck.hx
@@ -90,7 +90,6 @@ class ExtendedEmptyLinesCheck extends Check {
 		buildPolicyMap();
 		var emptyLines:ListOfEmptyLines = detectEmptyLines();
 		if (max <= 0) max = 1;
-
 		checkPackages(emptyLines);
 		checkImports(emptyLines);
 		checkTypes(emptyLines);
@@ -336,7 +335,8 @@ class ExtendedEmptyLinesCheck extends Check {
 		var brOpen = findTypeBrOpen(typeToken);
 		if (brOpen == null) return;
 		checkBetweenToken(emptyLines, typeToken, brOpen, getPolicy(TYPE_DEFINITION), "between type definition and left curly");
-		var brClose:TokenTree = brOpen.getLastChild();
+		var brClose:Null<TokenTree> = brOpen.getLastChild();
+		if (brClose == null) return;
 		var start:Int = checker.getLinePos(brOpen.pos.max).line;
 		var end:Int = checker.getLinePos(brClose.pos.min).line;
 		if (start == end) return;

diff --git a/src/checkstyle/checks/whitespace/SpacingCheck.hx b/src/checkstyle/checks/whitespace/SpacingCheck.hx
@@ -99,6 +99,7 @@ class SpacingCheck extends Check {
 
 		var lastExpr = null;
 
+		if (checker.ast == null) return;
 		checker.ast.walkFile(function(e) {
 			if (lastExpr == null) {
 				lastExpr = e;