Skip to content

Commit 04adaf0

Browse files
committed
Unstupid the prepends callback
Windows#prepends was overriding PrependMigrate#prepends
1 parent 32aa2c6 commit 04adaf0

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

lib/msf/core/payload/windows.rb

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
###
1313
module Msf::Payload::Windows
1414

15+
# Provides the #prepends method
1516
include Msf::Payload::Windows::PrependMigrate
1617

1718
#
@@ -26,13 +27,6 @@ module Msf::Payload::Windows
2627
}
2728

2829

29-
# @abstract Override to add additional stubs to prepend to the final
30-
# shellcode. Be sure to call super so other modules may add stubs.
31-
# @return [String] Stub to place at the begginning of generated shellcode
32-
def prepends
33-
""
34-
end
35-
3630
def generate(*args)
3731
return prepends + super
3832
end

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ def prepend_migrate?
3434
# Overload the generate() call to prefix our stubs
3535
#
3636
def prepends
37-
# Call the real generator to get the payload
38-
buf = super
3937
pre = ''
4038

4139
test_arch = [ *(self.arch) ]
@@ -51,7 +49,7 @@ def prepends
5149
pre << Metasm::Shellcode.assemble(Metasm::X64.new, migrate_asm).encode_string
5250
end
5351
end
54-
return (pre + buf)
52+
return pre
5553
end
5654

5755
#

0 commit comments

Comments
 (0)