ome minor guards and spec fixes

some minor conditional guards and spec fixes

Author: David Maloney

lib/msf/core/exploit.rb

@@ -688,10 +688,13 @@ def passive?
   # default target, that one will be automatically used.
   #
   def target
-    auto_idx = auto_targeted_index
-    unless auto_idx.nil?
-      datastore['TARGET'] = auto_idx
+    if self.respond_to?(:auto_targeted_index)
+      auto_idx = auto_targeted_index
+      if auto_idx.present?
+        datastore['TARGET'] = auto_idx
+      end
     end
+
     target_idx = target_index
     return (target_idx) ? targets[target_idx.to_i] : nil
   end

lib/msf/core/exploit/auto_target.rb

@@ -10,6 +10,7 @@ module Exploit::AutoTarget
     # @return [Boolean] whether or not to use our automatic targeting routine
     def auto_target?
       selected_target = targets[target_index]
+      return false if selected_target.nil?
       if selected_target.name =~ /Automatic/ && selected_target['AutoGenerated'] == true
         true
       else

lib/msf/core/exploit/remote/firefox_privilege_escalation.rb

@@ -151,7 +151,11 @@ def run_payload
 
   # @return [Boolean] the user has selected a javascript (non-native) target
   def js_target?
-    target.arch[0] == ARCH_FIREFOX
+    if target.arch
+      target.arch[0] == ARCH_FIREFOX
+    else
+      false
+    end
   end
 
 end

spec/lib/msf/ui/console/command_dispatcher/db_spec.rb

@@ -394,7 +394,7 @@
           "  -n,--name         Change the name of a host",
           "  -m,--comment      Change the comment of a host",
           "  -t,--tag          Add or specify a tag to a range of hosts",
-          "Available columns: address, arch, comm, comments, created_at, cred_count, detected_arch, exploit_attempt_count, host_detail_count, info, mac, name, note_count, os_flavor, os_lang, os_name, os_sp, purpose, scope, service_count, state, updated_at, virtual_host, vuln_count, tags"
+          "Available columns: address, arch, comm, comments, created_at, cred_count, detected_arch, exploit_attempt_count, host_detail_count, info, mac, name, note_count, os_family, os_flavor, os_lang, os_name, os_sp, purpose, scope, service_count, state, updated_at, virtual_host, vuln_count, tags"
         ]
       end
     end