Commit 399a11546d0ebf9159a84d2fbb17ab41275ca160

Authored by decalage2
1 parent d64c4743

oleform: fixed typo in consume_GuidAndFont

Showing 1 changed file with 6 additions and 3 deletions
oletools/oleform.py
@@ -122,7 +122,7 @@ def consume_GuidAndFont(stream): @@ -122,7 +122,7 @@ def consume_GuidAndFont(stream):
122 stream.read(9) 122 stream.read(9)
123 bFaceLen = stream.unpack('<B', 1) 123 bFaceLen = stream.unpack('<B', 1)
124 stream.read(bFaceLen) 124 stream.read(bFaceLen)
125 - elif UUIDs == (2948729120, 55886, 4558, 13349514450607572916L): 125 + elif UUIDS == (2948729120, 55886, 4558, 13349514450607572916L):
126 # UUID == {AFC20920-DA4E-11CE-B94300AA006887B4} 126 # UUID == {AFC20920-DA4E-11CE-B94300AA006887B4}
127 consume_TextProps(stream) 127 consume_TextProps(stream)
128 else: 128 else:
@@ -286,6 +286,9 @@ def extract_OleFormVariables(ole_file, stream_dir): @@ -286,6 +286,9 @@ def extract_OleFormVariables(ole_file, stream_dir):
286 data = ExtendedStream.open(ole_file, '/'.join(stream_dir + ['o'])) 286 data = ExtendedStream.open(ole_file, '/'.join(stream_dir + ['o']))
287 for var in variables: 287 for var in variables:
288 if var['ClsidCacheIndex'] != 23: 288 if var['ClsidCacheIndex'] != 23:
289 - raise OleFormParsingError('Unsupported stored type: {0}'.format(str(var['ClsidCacheIndex'])))  
290 - var['value'] = consume_MorphDataControl(data) 289 + #raise OleFormParsingError('Unsupported stored type: {0}'.format(str(var['ClsidCacheIndex'])))
  290 + print('ERROR: Unsupported stored type in user form: {0}'.format(str(var['ClsidCacheIndex'])))
  291 + var['value'] = None
  292 + else:
  293 + var['value'] = consume_MorphDataControl(data)
291 return variables 294 return variables