Merge pull request #275 from Gallopsled/asm-osx-sane

Make pwnlib.asm.asm more robust
Gallopsled · Jan 1, 2015 · 93396dd · 93396dd
2 parents 8b8cae8 + 063a1a4
commit 93396dd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pwnlib/asm.py b/pwnlib/asm.py
@@ -342,7 +342,7 @@ def asm(shellcode, vma = 0, **kwargs):
         osx = (platform.system() == 'Darwin')
 
         assembler = _assembler()
-        objcopy   = _objcopy() + ['-j.shellcode' if not osx else '-jLC_SEGMENT..shellcode."ax"', '-Obinary']
+        objcopy   = _objcopy() + ['-j', '.shellcode' if not osx else '*.shellcode*', '-Obinary']
         code      = '.org %#x\n' % vma
         code      += _arch_header()
         code      += cpp(shellcode)