Merge branch 'payload_defaults'

2014-02-26 10:28:46 -06:00 · 2014-02-26 10:28:46 -06:00 · d358fe5f94
parent bfdefdb338 3ed84d1e0b
commit d358fe5f94
1 changed files with 2 additions and 0 deletions
--- a/lib/msf/core/exploit/exe.rb
+++ b/lib/msf/core/exploit/exe.rb
@ -139,8 +139,10 @@ protected

    # Prefer the target's platform/architecture information, but use
    # the module's if no target specific information exists
+    opts[:platform] ||= payload_instance.platform if self.respond_to? :payload_instance
    opts[:platform] ||= target_platform  if self.respond_to? :target_platform
    opts[:platform] ||= platform         if self.respond_to? :platform
+    opts[:arch] ||= payload_instance.arch if self.respond_to? :payload_instance
    opts[:arch] ||= target_arch          if self.respond_to? :target_arch
    opts[:arch] ||= arch                 if self.respond_to? :arch
  end