Skip to content
Permalink
Browse files

Merge branch 'dev' into dev3

  • Loading branch information...
Arusekk committed Oct 22, 2019
2 parents fb11784 + ec314dd commit 2116bf3118612a5f53a9a02a8d46ed2f8b1cefcb
Showing with 4 additions and 4 deletions.
  1. +1 −1 .travis.yml
  2. +3 −3 pwnlib/shellcraft/templates/common/linux/syscalls/{break.asm → break_.asm}
@@ -37,7 +37,7 @@ before_install:
install:
- pip install --upgrade pip
- pip install --upgrade appdirs # https://github.com/ActiveState/appdirs/issues/89#issuecomment-282326570
- python setup.py egg_info
- python setup.py egg_info # pypa/pip#6275
- pip install --upgrade --editable .
- pip install --upgrade --requirement docs/requirements.txt
before_script:
@@ -5,7 +5,7 @@ import pwnlib.constants
import pwnlib.shellcraft
import six
%>
<%docstring>break(vararg_0, vararg_1, vararg_2, vararg_3, vararg_4) -> str
<%docstring>break_(vararg_0, vararg_1, vararg_2, vararg_3, vararg_4) -> str

Invokes the syscall break.

@@ -86,7 +86,7 @@ Returns:
else:
raise Exception("Could not locate any syscalls: %r" % syscalls)
%>
/* break(${', '.join(syscall_repr)}) */
/* break_(${', '.join(syscall_repr)}) */
%for name, arg in string_arguments.items():
${pwnlib.shellcraft.pushstr(arg, append_null=(b'\x00' not in arg))}
${pwnlib.shellcraft.mov(regs[argument_names.index(name)], abi.stack)}
@@ -98,4 +98,4 @@ Returns:
${pwnlib.shellcraft.push(arg)}
%endfor
${pwnlib.shellcraft.setregs(register_arguments)}
${pwnlib.shellcraft.syscall(syscall)}
${pwnlib.shellcraft.syscall(syscall)}

0 comments on commit 2116bf3

Please sign in to comment.
You can’t perform that action at this time.