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.

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

drakpdb: Fix profile generation for a few PDBs #518

Merged
merged 1 commit into from
Apr 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions drakrun/drakrun/drakpdb.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,22 @@
"T_32PUSHORT": ["Pointer", dict(target="unsigned short")],
"T_32PVOID": ["Pointer", dict(target="Void")],
"T_32PWCHAR": ["Pointer", dict(target="UnicodeString")],
"T_32PHRESULT": ["Pointer", dict(target="long")],
"T_64PINT4": ["Pointer", dict(target="long")],
"T_64PLONG": ["Pointer", dict(target="long")],
"T_64PQUAD": ["Pointer", dict(target="long long")],
"T_64PSHORT": ["Pointer", dict(target="short")],
"T_64PRCHAR": ["Pointer", dict(target="unsigned char")],
"T_64PUCHAR": ["Pointer", dict(target="unsigned char")],
"T_64PWCHAR": ["Pointer", dict(target="String")],
"T_64PULONG": ["Pointer", dict(target="unsigned long")],
"T_64PUQUAD": ["Pointer", dict(target="unsigned long long")],
"T_64PUSHORT": ["Pointer", dict(target="unsigned short")],
"T_64PVOID": ["Pointer", dict(target="Void")],
"T_64PREAL32": ["Pointer", dict(target="float")],
"T_64PREAL64": ["Pointer", dict(target="double")],
"T_64PUINT4": ["Pointer", dict(target="unsigned int")],
"T_64PHRESULT": ["Pointer", dict(target="long")],
"T_BOOL08": ["unsigned char", {}],
"T_CHAR": ["char", {}],
"T_INT4": ["long", {}],
Expand All @@ -87,6 +94,7 @@
"T_SHORT": ["short", {}],
"T_UCHAR": ["unsigned char", {}],
"T_UINT4": ["unsigned long", {}],
"T_UINT8": ["unsigned long long", {}],
"T_ULONG": ["unsigned long", {}],
"T_UQUAD": ["unsigned long long", {}],
"T_USHORT": ["unsigned short", {}],
Expand Down Expand Up @@ -228,6 +236,9 @@ def process_struct(struct_info):

try:
for struct in struct_info.fieldlist.substructs:
# try to access struct.offset and trigger
# an AttributeError if it's missing
_ = struct.offset
ss[struct.name] = struct
except AttributeError:
pass
Expand Down
4 changes: 3 additions & 1 deletion drakrun/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ karton-core==4.2.0
minio==5.0.7
redis==3.5.3
pefile==2019.4.18
pdbparse==1.4
# Use pdbparse from master branch
# current release - 1.5 has troubles parsing some of the PDBs
pdbparse @ git+https://github.com/moyix/pdbparse.git@b5b61793e4a457c43a5aef7a0499b959826b2c04
construct==2.9.45
requests==2.25.1
tqdm==4.43.0
Expand Down