Peter M. Groen / oletools

Commit 27dc536049de23cc4e3766b34c80472efb1ebe64

Authored by decalage2
1 parent 95ca88d2

fixed issue #242 (apply unquote to fldSimple tags)

Inline Side-by-side
Showing 2 changed files with 5 additions and 4 deletions
oletools/msodde.py
  View file @27dc536
@@ -20,7 +20,7 @@ http://www.decalage.info/python/oletools @@ -20,7 +20,7 @@ http://www.decalage.info/python/oletools
20 20
21 # === LICENSE ================================================================= 21 # === LICENSE =================================================================
22 22
23 -# msodde is copyright (c) 2017 Philippe Lagadec (http://www.decalage.info) 23 +# msodde is copyright (c) 2017-2018 Philippe Lagadec (http://www.decalage.info)
24 # All rights reserved. 24 # All rights reserved.
25 # 25 #
26 # Redistribution and use in source and binary forms, with or without 26 # Redistribution and use in source and binary forms, with or without
@@ -94,8 +94,9 @@ from oletools import rtfobj @@ -94,8 +94,9 @@ from oletools import rtfobj
94 # 2017-11-29 PL: - added support for RTF files (issue #223) 94 # 2017-11-29 PL: - added support for RTF files (issue #223)
95 # 2017-12-07 CH: - ensure rtf file is closed 95 # 2017-12-07 CH: - ensure rtf file is closed
96 # 2018-01-05 CH: - add CSV 96 # 2018-01-05 CH: - add CSV
  97 +# 2018-01-11 PL: - fixed issue #242 (apply unquote to fldSimple tags)
97 98
98 -__version__ = '0.52dev10' 99 +__version__ = '0.52dev11'
99 100
100 # ----------------------------------------------------------------------------- 101 # -----------------------------------------------------------------------------
101 # TODO: field codes can be in headers/footers/comments - parse these 102 # TODO: field codes can be in headers/footers/comments - parse these
@@ -627,7 +628,7 @@ def process_xml(data): @@ -627,7 +628,7 @@ def process_xml(data):
627 for elem in root.iter(TAG_W_FLDSIMPLE): 628 for elem in root.iter(TAG_W_FLDSIMPLE):
628 # concatenate the attribute of the field, if present: 629 # concatenate the attribute of the field, if present:
629 if elem.attrib is not None: 630 if elem.attrib is not None:
630 - fields.append(elem.attrib[ATTR_W_INSTR]) 631 + fields.append(unquote(elem.attrib[ATTR_W_INSTR]))
631 632
632 return fields 633 return fields
633 634
setup.py
  View file @27dc536
@@ -42,7 +42,7 @@ import os, fnmatch @@ -42,7 +42,7 @@ import os, fnmatch
42 #--- METADATA ----------------------------------------------------------------- 42 #--- METADATA -----------------------------------------------------------------
43 43
44 name = "oletools" 44 name = "oletools"
45 -version = '0.52dev9' 45 +version = '0.52dev11'
46 desc = "Python tools to analyze security characteristics of MS Office and OLE files (also called Structured Storage, Compound File Binary Format or Compound Document File Format), for Malware Analysis and Incident Response #DFIR" 46 desc = "Python tools to analyze security characteristics of MS Office and OLE files (also called Structured Storage, Compound File Binary Format or Compound Document File Format), for Malware Analysis and Incident Response #DFIR"
47 long_desc = open('oletools/README.rst').read() 47 long_desc = open('oletools/README.rst').read()
48 author = "Philippe Lagadec" 48 author = "Philippe Lagadec"