Merge pull request #1696 from xiemaisi/js/ql4ql-fixes

Approved by asger-semmle

Author: semmle-qlci

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

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

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)
+      }
     }
   }