Skip to content

Commit 3e163e9

Browse files
committed
Merge branch 'stable' into beta
2 parents 1a94aca + 267c6cc commit 3e163e9

File tree

6 files changed

+17
-11
lines changed

6 files changed

+17
-11
lines changed

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
sudo: false
1+
dist: precise
22
language: python
33
addons:
44
apt:
55
packages:
66
- gcc-multilib
7-
- gcc-4.6-arm-linux-gnueabihf
87
- lib32stdc++6
98
- ash
109
- bash
@@ -18,8 +17,8 @@ cache:
1817
- pip
1918
- directories:
2019
- usr
21-
- /home/travis/virtualenv/python2.7.9/lib/python2.7/site-packages/
22-
- /home/travis/virtualenv/python2.7.9/bin/
20+
- /home/travis/virtualenv/python2.7.13/lib/python2.7/site-packages/
21+
- /home/travis/virtualenv/python2.7.13/bin/
2322
python:
2423
- "2.7"
2524
before_install:

pwnlib/elf/corefile.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ def __init__(self, *a, **kw):
545545
log.warn('Could not find the stack!')
546546
self.stack = None
547547

548-
with context.local(bytes=self.bytes, log_level='error'):
548+
with context.local(bytes=self.bytes, log_level='warn'):
549549
try:
550550
self._parse_stack()
551551
except ValueError:
@@ -826,6 +826,10 @@ def _parse_stack(self):
826826
# find a pointer to this address, followed by a NULL.
827827
last_env_addr = address + 1
828828
p_last_env_addr = stack.find(pack(last_env_addr), None, last_env_addr)
829+
if p_last_env_addr < 0:
830+
# Something weird is happening. Just don't touch it.
831+
log.warn_once("Found bad environment at %#x", last_env_addr)
832+
return
829833

830834
# Sanity check that we did correctly find the envp NULL terminator.
831835
envp_nullterm = p_last_env_addr+context.bytes

pwnlib/shellcraft/templates/i386/linux/connect.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Examples:
2424
'Hello'
2525

2626
>>> l = listen(fam='ipv6', timeout=5)
27-
>>> assembly = shellcraft.i386.linux.connect('ip6-localhost', l.lport, 'ipv6')
27+
>>> assembly = shellcraft.i386.linux.connect('::1', l.lport, 'ipv6')
2828
>>> p = run_assembly(assembly)
2929
>>> assert l.wait_for_connection()
3030

travis/docker/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ MAINTAINER Maintainer Gallopsled et al.
88

99
USER root
1010

11+
RUN apt-get update
12+
1113
# Use UTF-8
14+
RUN apt-get install -y locales
1215
RUN locale-gen en_US.UTF-8
1316
ENV LANG en_US.UTF-8
1417
ENV LANGUAGE en_US:en

travis/install.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash -e
2-
set -e
2+
set -ex
33

44
local_deb_extract()
55
{
@@ -15,7 +15,7 @@ install_deb()
1515
package=$1
1616
echo "Installing $package"
1717
INDEX="http://packages.ubuntu.com/en/$version/amd64/$package/download"
18-
URL=$(curl "$INDEX" | grep -Eo "https?://.*$package.*\.deb" | head -1)
18+
URL=$(curl -L "$INDEX" | grep -Eo "https?://.*$package.*\.deb" | head -1)
1919
local_deb_extract "$URL"
2020
}
2121

@@ -198,4 +198,4 @@ elif [[ "$(uname)" == "Linux" ]]; then
198198
setup_android_emulator
199199
fi
200200

201-
set +e
201+
set +ex

travis/ssh_setup.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# All of the "conditional sudo" is to do container-based builds on
66
# Travis which are much, much faster.
7-
set -e
7+
set -ex
88

99
U=travis
1010
H=/home/$U
@@ -55,4 +55,4 @@ EOF
5555

5656
ssh -o "StrictHostKeyChecking no" -vvvv [email protected] id
5757

58-
set +e
58+
set +ex

0 commit comments

Comments
 (0)