Skip to content
Permalink
Browse files

Merge branch 'dev' into dev3

  • Loading branch information...
Arusekk committed Jun 22, 2019
2 parents 6f127e7 + c15afc5 commit 8ffac64fdc1bcc410aa7c38968f7b9ce632e1db9
Showing with 12 additions and 8 deletions.
  1. +0 −1 .travis.yml
  2. +4 −0 pwnlib/commandline/phd.py
  3. +1 −1 pwnlib/commandline/scramble.py
  4. +2 −2 pwnlib/gdb.py
  5. +4 −3 pwnlib/tubes/process.py
  6. +1 −1 travis/install.sh
@@ -26,7 +26,6 @@ cache:
- usr
- /home/travis/virtualenv/python2.7.15/lib/python2.7/site-packages/
- /home/travis/virtualenv/python2.7.15/bin/
sudo: required
python:
- "2.7.15"
- "3.6"
@@ -5,6 +5,7 @@
import argparse
import os
import sys
import io

import pwnlib
pwnlib.args.free_form = False
@@ -89,6 +90,9 @@ def main(args):
else:
infile.seek(skip, os.SEEK_CUR)

if count:
infile = io.BytesIO(infile.read(count))

hl = []
if args.highlight:
for hs in args.highlight:
@@ -104,7 +104,7 @@ def main(args):
output = output.encode('ascii')
args.output.write(output)

if tty and fmt is not 'raw':
if tty and fmt != 'raw':
args.output.write(b'\n')


@@ -442,7 +442,7 @@ def debug(args, gdbscript=None, exe=None, ssh=None, env=None, sysroot=None, **kw
if not exe:
log.error("%s does not exist" % orig_args[0])
else:
gdbscript = 'file %s\n%s' % (exe, gdbscript)
gdbscript = 'file "%s"\n%s' % (exe, gdbscript)

# Start gdbserver/qemu
# (Note: We override ASLR here for the gdbserver process itself.)
@@ -726,7 +726,7 @@ def findexe():

if exe:
# The 'file' statement should go first
pre = 'file %s\n%s' % (exe, pre)
pre = 'file "%s"\n%s' % (exe, pre)

cmd = binary()

@@ -345,9 +345,10 @@ def __init__(self, argv = None,

# Set in non-blocking mode so that a call to call recv(1000) will
# return as soon as a the first byte is available
fd = self.proc.stdout.fileno()
fl = fcntl.fcntl(fd, fcntl.F_GETFL)
fcntl.fcntl(fd, fcntl.F_SETFL, fl | os.O_NONBLOCK)
if self.proc.stdout:
fd = self.proc.stdout.fileno()
fl = fcntl.fcntl(fd, fcntl.F_GETFL)
fcntl.fcntl(fd, fcntl.F_SETFL, fl | os.O_NONBLOCK)

# Save off information about whether the binary is setuid / setgid
self.uid = os.getuid()
@@ -67,7 +67,7 @@ setup_travis()
setup_linux()
{
sudo apt-get install -y software-properties-common openssh-server libncurses5-dev libncursesw5-dev openjdk-8-jre-headless
RELEASE="$(lsb-release -sr)"
RELEASE="$(lsb_release -sr)"
if [[ "$RELEASE" < "16.04" ]]; then
sudo apt-add-repository --yes ppa:pwntools/binutils
sudo apt-get update

0 comments on commit 8ffac64

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