Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

check if ":" exists before index(':') #1159

Merged
merged 5 commits into from
Jun 4, 2018
Merged

check if ":" exists before index(':') #1159

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3903a78
check if ":" exists before index(':')
excalibur44 May 29, 2018
9a32c30
Merge branch 'stable' into stable
zachriggle May 30, 2018
d17b70c
Update proc.py
zachriggle May 30, 2018
0785269
Merge branch 'stable' into stable
zachriggle May 30, 2018
4aacb68
Merge branch 'stable' into stable
zachriggle May 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pwnlib/util/proc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,8 @@ def status(pid):
try:
with open('/proc/%d/status' % pid) as fd:
for line in fd:
if -1 == line.find(':'):
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe this looks better?

if ':' not in line:
    continue

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, this would probably be better. Thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

continue
i = line.index(':')
key = line[:i]
val = line[i + 2:-1] # initial :\t and trailing \n
Expand Down