Skip to content

Commit a133b58

Browse files
authored
Merge pull request rapid7#19763 from adfoster-r7/fix-flaky-windows-version-detection
Fix flaky windows version detection
2 parents 66f6cac + a65135e commit a133b58

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

lib/msf/core/windows_version.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,10 @@ def major_release_name
292292

293293
# Get a Windows OS version string representation for a given major, minor and build number
294294
def self.version_string(major, minor, build, version_module, mapping)
295-
version_module.constants.each do |version_sym|
296-
version = version_module.const_get(version_sym)
295+
sorted_versions = version_module.constants
296+
.map { |version_sym| [version_sym, version_module.const_get(version_sym)] }
297+
.sort_by { |_version_sym, version| version.segments }
298+
sorted_versions.each do |version_sym, version|
297299
segments = version.segments
298300
if segments[0..2] == [major, minor, build]
299301
return mapping[version_sym]

0 commit comments

Comments
 (0)