From 6fcf5ada94c82c6515b3a676c95d4f512ddf475b Mon Sep 17 00:00:00 2001 From: decalage2 Date: Mon, 24 Jul 2017 22:26:16 +0200 Subject: [PATCH] rtfobj: fixed call to RtfParser._end_of_file (issue #185) --- oletools/rtfobj.py | 8 +++++--- setup.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/oletools/rtfobj.py b/oletools/rtfobj.py index a1ccca6..77a9177 100644 --- a/oletools/rtfobj.py +++ b/oletools/rtfobj.py @@ -74,8 +74,9 @@ http://www.decalage.info/python/oletools # 2017-06-08 PL: - fixed issue/PR #143: bin object with negative length # 2017-06-29 PL: - temporary fix for issue #178 # 2017-07-14 v0.51.1 PL: - disabled logging of each control word (issue #184) +# 2017-07-24 PL: - fixed call to RtfParser._end_of_file (issue #185) -__version__ = '0.51.1dev2' +__version__ = '0.51.1dev3' # ------------------------------------------------------------------------------ # TODO: @@ -411,7 +412,8 @@ class RtfParser(object): self.index += len(m.group()) continue raise RuntimeError('Should not have reached this point - index=%Xh' % self.index) - self.end_of_file() + # call _end_of_file to make sure all groups are closed properly + self._end_of_file() def _open_group(self): @@ -527,7 +529,7 @@ class RtfParser(object): # log.debug('%Xh Reached End of File') # close any group/destination that is still open: while self.group_level > 0: - # log.debug('Group Level = %d, closing group' % self.group_level) + log.debug('Group Level = %d, closing group' % self.group_level) self._close_group() self.end_of_file() diff --git a/setup.py b/setup.py index a4e221a..4cbb357 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ import os, fnmatch #--- METADATA ----------------------------------------------------------------- name = "oletools" -version = '0.51.1dev2' +version = '0.51.1dev3' 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" long_desc = open('oletools/README.rst').read() author = "Philippe Lagadec" -- libgit2 0.21.4