Skip to content

Commit

Permalink
Merge branch 'stable' into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
peace-maker committed Jan 15, 2025
2 parents c02190b + 9472ec1 commit d7a7376
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version: 2
build:
os: ubuntu-22.04
tools:
python: "3"
python: "3.12"

sphinx:
configuration: docs/source/conf.py
Expand Down
2 changes: 1 addition & 1 deletion pwnlib/tubes/process.py
Original file line number Diff line number Diff line change
Expand Up @@ -1326,7 +1326,7 @@ def libs(self):
space.
"""
from pwnlib.util.proc import memory_maps
maps_raw = memory_maps(self.pid)
maps_raw = self.poll() is not None and memory_maps(self.pid)

if not maps_raw:
import pwnlib.elf.elf
Expand Down

0 comments on commit d7a7376

Please sign in to comment.