Merge pull request github#13422 from asgerf/rb/map_filter

Ruby: fix bug in filter_map summary

Author: asgerf

ruby/ql/lib/codeql/ruby/frameworks/core/Array.qll

@@ -2067,7 +2067,11 @@ module Enumerable {
 
     override predicate propagatesFlowExt(string input, string output, boolean preservesValue) {
       input = "Argument[self].Element[any]" and
-      output = ["Argument[block].Parameter[0]", "ReturnValue.Element[?]"] and
+      output = "Argument[block].Parameter[0]" and
+      preservesValue = true
+      or
+      input = "Argument[block].ReturnValue" and
+      output = "ReturnValue.Element[?]" and
       preservesValue = true
     }
   }

ruby/ql/src/change-notes/2023-06-12-map_filter.md

@@ -0,0 +1,6 @@
+---
+category: minorAnalysis
+---
+* Fixed a bug in how `map_filter` calls are analyzed. Previously, such calls would
+  appear to the return the receiver of the call, but now the return value of the callback
+  is properly taken into account.