Skip to content

Commit 6da66e8

Browse files
committed
fix enum default logic for bools that default to false
1 parent d811a2a commit 6da66e8

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

lib/msf/core/opt_base.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ def initialize(in_name, attrs = [],
3636
self.required = required
3737
self.desc = attrs.is_a?(String) ? attrs : desc
3838
self.enums = [ *(enums) ].map { |x| x.to_s }
39-
self.default = default || enums[0]
39+
if default.nil? && enums.length > 0
40+
self.default = enums[0]
41+
else
42+
self.default = default
43+
end
4044
regex_temp = regex
4145
else
4246
self.required = attrs[0] || required

lib/msf/core/opt_enum.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ def valid?(value = self.value, check_empty: true)
2525
end
2626

2727
def normalize(value = self.value)
28-
!valid?(value) ? nil : value.to_s
28+
if valid?(value)
29+
value.to_s
30+
else
31+
nil
32+
end
2933
end
3034

3135
def desc=(value)

0 commit comments

Comments
 (0)