Javascript: avoid null pointer exception on boolean values

Author: redsun82

javascript/extractor/src/com/semmle/jcorn/Parser.java

@@ -3115,7 +3115,7 @@ protected BlockStatement parseBlock(boolean allowStrict) {
       }
       first = false;
     }
-    if (oldStrict.equals(Boolean.FALSE)) this.setStrict(false);
+    if (Boolean.FALSE.equals(oldStrict)) this.setStrict(false);
     return this.finishNode(new BlockStatement(new SourceLocation(startLoc), body));
   }
 

javascript/extractor/src/com/semmle/js/ast/AFunctionExpression.java

@@ -35,8 +35,8 @@ public AFunctionExpression(
             id,
             params,
             body,
-            generator.equals(Boolean.TRUE),
-            async.equals(Boolean.TRUE),
+            Boolean.TRUE.equals(generator),
+            Boolean.TRUE.equals(async),
             typeParameters,
             parameterTypes,
             parameterDecorators,

javascript/extractor/src/com/semmle/js/ast/ComprehensionBlock.java

@@ -10,7 +10,7 @@ public ComprehensionBlock(SourceLocation loc, IPattern left, Expression right, B
     super("ComprehensionBlock", loc);
     this.left = left;
     this.right = right;
-    this.of = !of.equals(Boolean.FALSE);
+    this.of = !Boolean.FALSE.equals(of);
   }
 
   @Override

javascript/extractor/src/com/semmle/js/ast/ComprehensionExpression.java

@@ -19,7 +19,7 @@ public ComprehensionExpression(
     this.body = body;
     this.blocks = blocks;
     this.filter = filter;
-    this.generator = generator.equals(Boolean.TRUE);
+    this.generator = Boolean.TRUE.equals(generator);
   }
 
   @Override

javascript/extractor/src/com/semmle/js/ast/ForInStatement.java

@@ -16,7 +16,7 @@ public class ForInStatement extends EnhancedForStatement {
   public ForInStatement(
       SourceLocation loc, Node left, Expression right, Statement body, Boolean each) {
     super("ForInStatement", loc, left, right, body);
-    this.each = each.equals(Boolean.TRUE);
+    this.each = Boolean.TRUE.equals(each);
   }
 
   public boolean isEach() {

javascript/extractor/src/com/semmle/js/ast/InvokeExpression.java

@@ -27,8 +27,8 @@ public InvokeExpression(
     this.callee = callee;
     this.typeArguments = typeArguments;
     this.arguments = arguments;
-    this.optional = optional.equals(Boolean.TRUE);
-    this.onOptionalChain = onOptionalChain.equals(Boolean.TRUE);
+    this.optional = Boolean.TRUE.equals(optional);
+    this.onOptionalChain = Boolean.TRUE.equals(onOptionalChain);
   }
 
   /** The callee expression of this invocation. */

javascript/extractor/src/com/semmle/js/ast/Literal.java

@@ -76,7 +76,7 @@ public boolean isFalsy() {
     if (isRegExp()) return false;
     return value == null
         || value instanceof Number && ((Number) value).intValue() == 0
-        || value.equals(Boolean.FALSE)
+        || Boolean.FALSE.equals(value)
         || value instanceof String && ((String) value).isEmpty();
   }
 

javascript/extractor/src/com/semmle/js/ast/MemberExpression.java

@@ -22,9 +22,9 @@ public MemberExpression(
     super("MemberExpression", loc);
     this.object = object;
     this.property = property;
-    this.computed = computed.equals(Boolean.TRUE);
-    this.optional = optional.equals(Boolean.TRUE);
-    this.onOptionalChain = onOptionalChain.equals(Boolean.TRUE);
+    this.computed = Boolean.TRUE.equals(computed);
+    this.optional = Boolean.TRUE.equals(optional);
+    this.onOptionalChain = Boolean.TRUE.equals(onOptionalChain);
   }
 
   @Override

javascript/extractor/src/com/semmle/js/ast/Property.java

@@ -59,8 +59,8 @@ public Property(
     }
     this.rawValue = rawValue;
     this.kind = Kind.valueOf(StringUtil.uc(kind));
-    this.computed = computed.equals(Boolean.TRUE);
-    this.method = method.equals(Boolean.TRUE);
+    this.computed = Boolean.TRUE.equals(computed);
+    this.method = Boolean.TRUE.equals(method);
     this.decorators = new ArrayList<Decorator>();
   }
 

javascript/extractor/src/com/semmle/js/ast/TemplateElement.java

@@ -10,7 +10,7 @@ public TemplateElement(SourceLocation loc, Object cooked, String raw, Boolean ta
     super("TemplateElement", loc);
     this.cooked = cooked;
     this.raw = raw;
-    this.tail = tail.equals(Boolean.TRUE);
+    this.tail = Boolean.TRUE.equals(tail);
   }
 
   @Override