From d230921b89dd37dc814ddea62de5087395dde38a Mon Sep 17 00:00:00 2001
From: Max Schaefer <max@semmle.com>
Date: Mon, 5 Aug 2019 15:41:55 +0100
Subject: [PATCH 1/2] JavaScript: Remove two unused fields.

---
 .../ql/src/semmle/javascript/frameworks/ClientRequests.qll      | 2 --
 .../ql/src/semmle/javascript/frameworks/CryptoLibraries.qll     | 2 --
 2 files changed, 4 deletions(-)

diff --git a/javascript/ql/src/semmle/javascript/frameworks/ClientRequests.qll b/javascript/ql/src/semmle/javascript/frameworks/ClientRequests.qll
index 485c2f12f97..e7beb9f2258 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/ClientRequests.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/ClientRequests.qll
@@ -84,8 +84,6 @@ private string urlPropertyName() {
  * A model of a URL request made using the `request` library.
  */
 private class RequestUrlRequest extends ClientRequest::Range {
-  DataFlow::Node url;
-
   RequestUrlRequest() {
     exists(string moduleName, DataFlow::SourceNode callee | this = callee.getACall() |
       (
diff --git a/javascript/ql/src/semmle/javascript/frameworks/CryptoLibraries.qll b/javascript/ql/src/semmle/javascript/frameworks/CryptoLibraries.qll
index 7cfee868a51..cc239efd570 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/CryptoLibraries.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/CryptoLibraries.qll
@@ -329,8 +329,6 @@ private module NodeJSCrypto {
   }
 
   private class Apply extends CryptographicOperation, MethodCallExpr {
-    Expr input;
-
     InstantiatedAlgorithm instantiation;
 
     Apply() {

From 5026a55c25f4fc2daf8f3a35371155f9aee33e83 Mon Sep 17 00:00:00 2001
From: Max Schaefer <max@semmle.com>
Date: Mon, 5 Aug 2019 15:42:18 +0100
Subject: [PATCH 2/2] JavaScript: Fix a Cartesian product.

---
 javascript/ql/src/semmle/javascript/frameworks/Electron.qll | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/javascript/ql/src/semmle/javascript/frameworks/Electron.qll b/javascript/ql/src/semmle/javascript/frameworks/Electron.qll
index aa0ca16eacd..84373662a24 100644
--- a/javascript/ql/src/semmle/javascript/frameworks/Electron.qll
+++ b/javascript/ql/src/semmle/javascript/frameworks/Electron.qll
@@ -256,7 +256,10 @@ module Electron {
     private class IPCAdditionalFlowStep extends DataFlow::AdditionalFlowStep {
       IPCAdditionalFlowStep() { ipcFlowStep(this, _) }
 
-      override predicate step(DataFlow::Node pred, DataFlow::Node succ) { ipcFlowStep(pred, succ) }
+      override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
+        pred = this and
+        ipcFlowStep(pred, succ)
+      }
     }
   }