Add Robert's fix

Author: stephen-carter-at-sf

packages/code-analyzer-flow-engine/FlowScanner/flow_scanner/executor.py

@@ -185,7 +185,7 @@ def run(self) -> QueryManager:
                         tainted = self.current_frame.parser.get_tainted_inputs()
                     else:
                         tainted.update(self.current_frame.parser.get_tainted_inputs())
-                    next_frame.state.tainted_inputs = tainted
+                    next_frame.state.parser.tainted_inputs = tainted
 
                     # now switch execution to new frame
                     self.current_frame = next_frame

packages/code-analyzer-flow-engine/src/engine.ts

@@ -90,7 +90,7 @@ export class FlowScannerEngine extends Engine {
             queryIds,
             percentageUpdateHandler
         );
-        const convertedResults: EngineRunResults = toEngineRunResults(executionResults, ruleNames);
+        const convertedResults: EngineRunResults = toEngineRunResults(executionResults);
         this.emitRunRulesProgressEvent(100);
         return convertedResults;
     }
@@ -134,8 +134,7 @@ function normalizeRelativeCompletionPercentage(flowPercentage: number): number {
     return PRE_INVOCATION_RUN_PERCENT + ((flowPercentage * percentageSpread) / 100);
 }
 
-function toEngineRunResults(flowScannerExecutionResult: FlowScannerExecutionResult, requestedRules: string[]): EngineRunResults {
-    const requestedRulesSet: Set<string> = new Set(requestedRules);
+function toEngineRunResults(flowScannerExecutionResult: FlowScannerExecutionResult): EngineRunResults {
     const results: EngineRunResults = {
         violations: []
     };

packages/code-analyzer-flow-engine/test/engine.test.ts

@@ -86,7 +86,7 @@ describe('Tests for the FlowScannerEngine', () => {
             }, {});
             expect(countsPerRule).toEqual({
                 MissingDescription: 56,
-                MissingFaultHandler: 9, // TODO: Follow up with robert to ensure that this should be 9 (not 15 as it was before)
+                MissingFaultHandler: 9,
                 PreventPassingUserDataIntoElementWithoutSharing: 5,
                 PreventPassingUserDataIntoElementWithSharing: 2
             });
@@ -628,7 +628,7 @@ describe('Tests for the FlowScannerEngine', () => {
 
                     const results: EngineRunResults = await engine.runRules(PreventPassingUserDataRules, createRunOptions(workspace));
 
-                    expect(results.violations).toHaveLength(1); // TODO: This test is broken - need to check with Robert about this first!
+                    expect(results.violations).toHaveLength(1);
                     expect(results.violations[0]).toEqual(expectedViolation);
                 });
 
@@ -653,7 +653,7 @@ describe('Tests for the FlowScannerEngine', () => {
 
                     const results: EngineRunResults = await engine.runRules(PreventPassingUserDataRules, createRunOptions(workspace));
 
-                    expect(results.violations).toHaveLength(1); // TODO: This test is broken - need to check with Robert about this first!
+                    expect(results.violations).toHaveLength(1);
                     expect(results.violations[0]).toEqual(expectedViolation);
                 });