Commit e19347899fe5b09af063e78a4d6cf2a03d4287e9
1 parent
689317a2
fixed a bug I seem to have introduced (forgot to insert a _ before unicode)
Showing
1 changed file
with
1 additions
and
2 deletions
oletools/olevba.py
| @@ -1453,7 +1453,6 @@ def _extract_vba(ole, vba_root, project_path, dir_path): | @@ -1453,7 +1453,6 @@ def _extract_vba(ole, vba_root, project_path, dir_path): | ||
| 1453 | modulestreamname_sizeof_streamname_unicode = struct.unpack("<L", dir_stream.read(4))[0] | 1453 | modulestreamname_sizeof_streamname_unicode = struct.unpack("<L", dir_stream.read(4))[0] |
| 1454 | modulestreamname_streamname_unicode = dir_stream.read(modulestreamname_sizeof_streamname_unicode) | 1454 | modulestreamname_streamname_unicode = dir_stream.read(modulestreamname_sizeof_streamname_unicode) |
| 1455 | unused = modulestreamname_id | 1455 | unused = modulestreamname_id |
| 1456 | - unused = modulestreamname_streamname_unicode | ||
| 1457 | section_id = struct.unpack("<H", dir_stream.read(2))[0] | 1456 | section_id = struct.unpack("<H", dir_stream.read(2))[0] |
| 1458 | if section_id == 0x001C: | 1457 | if section_id == 0x001C: |
| 1459 | moduledocstring_id = section_id | 1458 | moduledocstring_id = section_id |
| @@ -1521,7 +1520,7 @@ def _extract_vba(ole, vba_root, project_path, dir_path): | @@ -1521,7 +1520,7 @@ def _extract_vba(ole, vba_root, project_path, dir_path): | ||
| 1521 | log.debug("StreamName = {0}".format(repr(modulestreamname_streamname))) | 1520 | log.debug("StreamName = {0}".format(repr(modulestreamname_streamname))) |
| 1522 | streamname_unicode = modulestreamname_streamname.decode(vba_codec) | 1521 | streamname_unicode = modulestreamname_streamname.decode(vba_codec) |
| 1523 | log.debug("StreamName.decode('%s') = %s" % (vba_codec, repr(streamname_unicode))) | 1522 | log.debug("StreamName.decode('%s') = %s" % (vba_codec, repr(streamname_unicode))) |
| 1524 | - log.debug("StreamNameUnicode = {0}".format(repr(modulestreamname_streamnameunicode))) | 1523 | + log.debug("StreamNameUnicode = {0}".format(repr(modulestreamname_streamname_unicode))) |
| 1525 | log.debug("TextOffset = {0}".format(moduleoffset_textoffset)) | 1524 | log.debug("TextOffset = {0}".format(moduleoffset_textoffset)) |
| 1526 | 1525 | ||
| 1527 | code_path = vba_root + u'VBA/' + streamname_unicode | 1526 | code_path = vba_root + u'VBA/' + streamname_unicode |