Land #5819, update stage_payload call arguments

lib/msf/core/payload/generic.rb

@@ -20,23 +20,13 @@ module Payload::Generic
   def initialize(info = {})
     super(merge_info(info,
       'Arch'     => ARCH_ALL - [ARCH_TTY],
-      'Platform' => ''))
+      'Platform' => ''
+    ))
 
-    register_advanced_options(
+    register_advanced_options([
-      [
+      OptString.new('PLATFORM', [false, "The platform that is being targeted", nil]),
-        OptString.new('PLATFORM',
+      OptString.new('ARCH', [false, "The architecture that is being targeted", nil])
-          [
+    ], Msf::Payload::Generic)
-            false,
-            "The platform that is being targeted",
-            nil
-          ]),
-        OptString.new('ARCH',
-          [
-            false,
-            "The architecture that is being targeted",
-            nil
-          ])
-      ], Msf::Payload::Generic)
   end
 
   #
@@ -103,8 +93,8 @@ module Payload::Generic
   # Stager overrides
   #
 
-  def stage_payload
+  def stage_payload(*args)
-    redirect_to_actual(:stage_payload)
+    redirect_to_actual(:stage_payload, *args)
   end
 
   def stage_offsets

lib/msf/core/payload/stager.rb

@@ -88,7 +88,7 @@ module Msf::Payload::Stager
   # Can be nil if the final stage is not pre-assembled.
   #
   # @return [String,nil]
-  def stage_payload
+  def stage_payload(opts = {})
     return module_info['Stage']['Payload']
   end
 

lib/msf/core/payload/windows/reflectivedllinject.rb

@@ -70,7 +70,7 @@ module Payload::Windows::ReflectiveDllInject
     ^
   end
 
-  def stage_payload
+  def stage_payload(opts = {})
     # Exceptions will be thrown by the mixin if there are issues.
     dll, offset = load_rdi_dll(library_path)
 

lib/msf/core/payload/windows/x64/reflectivedllinject.rb

@@ -71,7 +71,7 @@ module Payload::Windows::ReflectiveDllInject_x64
     ^
   end
 
-  def stage_payload
+  def stage_payload(opts = {})
     # Exceptions will be thrown by the mixin if there are issues.
     dll, offset = load_rdi_dll(library_path)