Land #18369, Fix opt address local crash when ipaddr is nil

rapid7 · Sep 15, 2023 · ba9f879 · ba9f879
2 parents 85cf00e + 871e1f4
commit ba9f879
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/msf/core/opt_address_local.rb b/lib/msf/core/opt_address_local.rb
@@ -23,7 +23,7 @@ def normalize(value)
     addrs = addrs.map { |x| x['addr'].split('%').first }.select do |addr|
       begin
         IPAddr.new(addr)
-      rescue IPAddr::InvalidAddressError
+      rescue IPAddr::Error
         false
       end
     end

diff --git a/spec/lib/msf/core/opt_address_local_spec.rb b/spec/lib/msf/core/opt_address_local_spec.rb
@@ -62,7 +62,7 @@
             # Darwin AF_LINK
             18 => [
               {
-                'addr' => '55:44:33:22:11:00',
+                'addr' => '',
                 'netmask' => nil,
                 'broadcast' => nil
               }