Land rapid7#6946 Fix a bug with OptPort validation when not req

Author: bpatterson-r7

lib/msf/core/opt_int.rb

@@ -15,15 +15,17 @@ def type
   def normalize(value)
     if value.to_s.match(/^0x[a-fA-F\d]+$/)
       value.to_i(16)
-    else
+    elsif value.present?
       value.to_i
+    else
+      nil
     end
   end
 
   def valid?(value, check_empty: true)
     return false if check_empty && empty_required_value?(value)
 
-    if value and not value.to_s.match(/^0x[0-9a-fA-F]+$|^-?\d+$/)
+    if value.present? and not value.to_s.match(/^0x[0-9a-fA-F]+$|^-?\d+$/)
       return false
     end
 

lib/msf/core/opt_port.rb

@@ -13,7 +13,7 @@ def type
   end
 
   def valid?(value, check_empty: true)
-    port = normalize(value)
+    port = normalize(value).to_i
     super && port <= 65535 && port >= 0
   end
 end