Make #prepends() actually work

kernelsmith · Jan 22, 2013 · ff7756c · ff7756c
1 parent c37510f
commit ff7756c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/msf/core/payload/windows.rb b/lib/msf/core/payload/windows.rb
@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 require 'msf/core'
-require 'msf/core/payload/windows/prepend_migrate'
 
 ###
 #
@@ -12,6 +11,7 @@
 ###
 module Msf::Payload::Windows
 
+	require 'msf/core/payload/windows/prepend_migrate'
 	# Provides the #prepends method
 	include Msf::Payload::Windows::PrependMigrate
 
@@ -27,8 +27,8 @@ module Msf::Payload::Windows
 		}
 
 
-	def generate(*args)
-		return prepends + super
+	def generate
+		return prepends(super)
 	end
 
 	#

diff --git a/lib/msf/core/payload/windows/prepend_migrate.rb b/lib/msf/core/payload/windows/prepend_migrate.rb
@@ -33,7 +33,7 @@ def prepend_migrate?
 	#
 	# Overload the generate() call to prefix our stubs
 	#
-	def prepends
+	def prepends(buf)
 		pre = ''
 
 		test_arch = [ *(self.arch) ]
@@ -49,7 +49,7 @@ def prepends
 				pre << Metasm::Shellcode.assemble(Metasm::X64.new, migrate_asm).encode_string
 			end
 		end
-		return pre
+		return pre + buf
 	end
 
 	#