Always clone modules before running them via the simplified wrappers.

This prevents changes to the datastore or instance variables from
being carried over into a second run

lib/msf/base/simple/auxiliary.rb

@@ -42,6 +42,9 @@ module Auxiliary
 	#
 	def self.run_simple(mod, opts = {})
 
+		# Clone the module to prevent changes to the original instance
+		mod = mod.replicant
+
 		# Import options from the OptionStr or Option hash.
 		mod._import_extra_options(opts)
 

lib/msf/base/simple/exploit.rb

@@ -58,6 +58,9 @@ module Exploit
 		# Trap and print errors here (makes them UI-independent)
 		begin
 
+			# Clone the module to prevent changes to the original instance
+			exploit = exploit.replicant
+		
 			# Import options from the OptionStr or Option hash.
 			exploit._import_extra_options(opts)
 

lib/msf/base/simple/payload.rb

@@ -42,6 +42,9 @@ module Payload
 	#
 	def self.generate_simple(payload, opts)
 
+		# Clone the module to prevent changes to the original instance
+		payload = payload.replicant
+
 		# Import any options we may need
 		payload._import_extra_options(opts)
 		framework = payload.framework

lib/msf/base/simple/post.rb

@@ -38,6 +38,9 @@ module Post
 	#
 	def self.run_simple(mod, opts = {})
 
+		# Clone the module to prevent changes to the original instance
+		mod = mod.replicant
+
 		# Import options from the OptionStr or Option hash.
 		mod._import_extra_options(opts)