Skip to content

Commit

Permalink
Fix hexdump_iter for actual file objects, like those used by phd (#846)
Browse files Browse the repository at this point in the history
  • Loading branch information
zachriggle authored Jan 11, 2017
1 parent d1edd27 commit 9c2f0f4
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions pwnlib/util/fiddling.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
import base64
import random
import os
import re
import string
import StringIO
Expand Down Expand Up @@ -615,14 +616,15 @@ def hexdump_iter(fd, width=16, skip=True, hexii=False, begin=0, style=None,
total = fd.len
else:
# Save the current file offset
cur = fd.seek(0, os.SEEK_CUR)
cur = fd.tell()

# Determine the total size of the file
fd.seek(0, os.SEEK_END)
total = fd.tell()
total = fd.tell() - cur

# Restore the file offset, and
fd.seek(cur or 0, os.SEEK_SET)

# Restore the file offset
fd.seek(cur, os.SEEK_SET)

if hexii:
column_sep = ''
Expand Down

0 comments on commit 9c2f0f4

Please sign in to comment.