Merge pull request #2 from talhaHavadar/master

Schamper · web-flow · commit 16ea40940616 · 2019-03-04T13:47:14.000+01:00
Add support for parsing bitfields with spaces between column.
diff --git a/dissect/cstruct/cstruct.py b/dissect/cstruct/cstruct.py
@@ -401,7 +401,7 @@ def _structs(self, data):
 
     def _parse_fields(self, s):
         fields = re.finditer(
-            r'(?P<type>[^\s]+)\s+(?P<name>[^\s\[:]+)(:(?P<bits>\d+))?(\[(?P<count>[^;\n]*)\])?;',
+            r'(?P<type>[^\s]+)\s+(?P<name>[^\s\[:]+)(\s*:\s*(?P<bits>\d+))?(\[(?P<count>[^;\n]*)\])?;',
             s,
         )
         r = []

Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ def _structs(self, data):`
`401`	`401`
`402`	`402`	`def _parse_fields(self, s):`
`403`	`403`	`fields = re.finditer(`
`404`		`- r'(?P<type>[^\s]+)\s+(?P<name>[^\s\[:]+)(:(?P<bits>\d+))?(\[(?P<count>[^;\n]*)\])?;',`
	`404`	`+ r'(?P<type>[^\s]+)\s+(?P<name>[^\s\[:]+)(\s:\s(?P<bits>\d+))?(\[(?P<count>[^;\n]*)\])?;',`
`405`	`405`	`s,`
`406`	`406`	`)`
`407`	`407`	`r = []`