Skip to content

Commit

Permalink
Fix: GDB 15.1 rpyc detection (#2469)
Browse files Browse the repository at this point in the history
* Fix: GDB 15 rpyc detection

* Update CHANGELOG.md

* Changelog on the right version

* Remove extra newline in CHANGELOG.md
  • Loading branch information
SecT0uch authored Sep 26, 2024
1 parent 7c79c73 commit 5c1fb1d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,12 @@ The table below shows which release corresponds to each branch, and what date th
- [#2466][2466] Fix PLT emulation with Unicorn 2.1.0
- [#2466][2466] Switch to PyPi Simple API for update checks
- [#2467][2467] Fix loading at all on Windows
- [#2469][2469] GDB 15+ rpyc detection

[2445]: https://github.com/Gallopsled/pwntools/pull/2445
[2466]: https://github.com/Gallopsled/pwntools/pull/2466
[2467]: https://github.com/Gallopsled/pwntools/pull/2467
[2469]: https://github.com/Gallopsled/pwntools/pull/2469

## 4.13.0 (`stable`)

Expand Down
2 changes: 1 addition & 1 deletion pwnlib/gdb.py
Original file line number Diff line number Diff line change
Expand Up @@ -1245,7 +1245,7 @@ def preexec_fn():
else:
# Check to see if RPyC is installed at all in GDB
rpyc_check = [gdb_binary, '--nx', '-batch', '-ex',
'python import rpyc; import sys; sys.exit(123)']
'python import rpyc; import gdb; gdb.execute("quit 123")']

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

0 comments on commit 5c1fb1d

Please sign in to comment.