Mirrors/m1n1
2
0
Fork 0
mirror of https://github.com/AsahiLinux/m1n1 synced 2024-11-11 02:04:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

m1n1.constructutils: Handle variable-length tail structs nicely

Browse source 
Signed-off-by: Hector Martin <marcan@marcan.st>
This commit is contained in:
Hector Martin 2022-07-11 18:59:14 +09:00
parent 60c523d1a6
commit 0b509daa47
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
proxyclient/m1n1/constructutils.py
View file

@ -158,11 +158,13 @@ class ReloadableConstructMeta(ReloadableMeta, Construct):
try:
sizeof = subcon.sizeof()
except:
break
sizeof = None
if isinstance(subcon, Renamed):
name = subcon.name
subcon = subcon.subcon
cls._off[name] = off, sizeof
if sizeof is None:
break
off += sizeof
return cls
@ -380,7 +382,11 @@ class ConstructClass(ConstructClassBase, Container):
meta = ""
if key in self._off:
offv, sizeof = self._off[key]
off = f"\x1b[32m[{offv:3x}.{sizeof:3x}]\x1b[m "
if sizeof is not None:
sizeofs = f"{sizeof:3x}"
else:
sizeofs = " *"
off = f"\x1b[32m[{offv:3x}.{sizeofs}]\x1b[m "
if key in self._meta:
meta = f" \x1b[34m{self._meta[key]}\x1b[m"
if '\n' in val_repr: