Skip to content

Commit a3f14df

Browse files
committed
Merge branch 'stable' into beta
2 parents f47e417 + 78dd777 commit a3f14df

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

CHANGELOG.md

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ The table below shows which release corresponds to each branch, and what date th
1111
| ---------------- | -------- | ---------------------- |
1212
| [4.15.0](#4150-dev) | `dev` |
1313
| [4.14.0](#4140-beta) | `beta` |
14-
| [4.13.0](#4130-stable) | `stable` | Aug 12, 2024
14+
| [4.13.1](#4131-stable) | `stable` | Sep 29, 2024
15+
| [4.13.0](#4130) | | Aug 12, 2024
1516
| [4.12.0](#4120) | | Feb 22, 2024
1617
| [4.11.1](#4111) | | Nov 14, 2023
1718
| [4.11.0](#4110) | | Sep 15, 2023
@@ -72,7 +73,17 @@ The table below shows which release corresponds to each branch, and what date th
7273

7374
## 4.15.0 (`dev`)
7475

76+
- [#2471][2471] Properly close spawned kitty window
77+
- [#2358][2358] Cache output of `asm()`
78+
- [#2457][2457] Catch exception of non-ELF files in checksec.
79+
- [#2444][2444] Add `ELF.close()` to release resources
80+
- [#2413][2413] libcdb: improve the search speed of `search_by_symbol_offsets` in local libc-database
7581

82+
[2471]: https://github.com/Gallopsled/pwntools/pull/2471
83+
[2358]: https://github.com/Gallopsled/pwntools/pull/2358
84+
[2457]: https://github.com/Gallopsled/pwntools/pull/2457
85+
[2444]: https://github.com/Gallopsled/pwntools/pull/2444
86+
[2413]: https://github.com/Gallopsled/pwntools/pull/2413
7687

7788
## 4.14.0 (`beta`)
7889

@@ -118,18 +129,20 @@ The table below shows which release corresponds to each branch, and what date th
118129
[2435]: https://github.com/Gallopsled/pwntools/pull/2435
119130
[2437]: https://github.com/Gallopsled/pwntools/pull/2437
120131

121-
## 4.13.1
132+
## 4.13.1 (`stable`)
122133

123134
- [#2445][2445] Fix parsing the PLT on Windows
124135
- [#2466][2466] Fix PLT emulation with Unicorn 2.1.0
125136
- [#2466][2466] Switch to PyPi Simple API for update checks
126137
- [#2467][2467] Fix loading at all on Windows
138+
- [#2469][2469] GDB 15+ rpyc detection
127139

128140
[2445]: https://github.com/Gallopsled/pwntools/pull/2445
129141
[2466]: https://github.com/Gallopsled/pwntools/pull/2466
130142
[2467]: https://github.com/Gallopsled/pwntools/pull/2467
143+
[2469]: https://github.com/Gallopsled/pwntools/pull/2469
131144

132-
## 4.13.0 (`stable`)
145+
## 4.13.0
133146

134147
- [#2242][2242] Term module revamp: activating special handling of terminal only when necessary
135148
- [#2277][2277] elf: Resolve more relocations into GOT entries

pwnlib/gdb.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1203,7 +1203,7 @@ def findexe():
12031203
cmd += [exe]
12041204

12051205
if pid and not context.os == 'android':
1206-
cmd += [str(pid)]
1206+
cmd += ['-p', str(pid)]
12071207

12081208
if context.os == 'android' and pid:
12091209
runner = _get_runner()
@@ -1275,7 +1275,7 @@ def preexec_fn():
12751275
else:
12761276
# Check to see if RPyC is installed at all in GDB
12771277
rpyc_check = [gdb_binary, '--nx', '-batch', '-ex',
1278-
'python import rpyc; import sys; sys.exit(123)']
1278+
'python import rpyc; import gdb; gdb.execute("quit 123")']
12791279

12801280
if 123 != tubes.process.process(rpyc_check).poll(block=True):
12811281
log.error('Failed to connect to GDB: rpyc is not installed')

0 commit comments

Comments
 (0)