Peter M. Groen / oletools

Commit 22951d138449ad09e08e445c69d44420ea061fbc

Authored by Philippe Lagadec
Committed by GitHub
2 parents 94fe13c7 9e1dc7fe

Merge pull request #111 from christian-intra2net/ppt-parser-import-fix 

Ppt parser import fix
Inline Side-by-side
Showing 2 changed files with 3 additions and 8 deletions
oletools/olevba.py
  View file @22951d1
@@ -2532,7 +2532,7 @@ class VBA_Parser(object): @@ -2532,7 +2532,7 @@ class VBA_Parser(object):
2532 self.ole_file.close() # just in case 2532 self.ole_file.close() # just in case
2533 self.ole_file = None # required to make other methods look at ole_subfiles 2533 self.ole_file = None # required to make other methods look at ole_subfiles
2534 self.type = TYPE_PPT 2534 self.type = TYPE_PPT
2535 - except Exception as exc: 2535 + except (ppt_parser.PptUnexpectedData, ValueError) as exc:
2536 if self.container == 'PptParser': 2536 if self.container == 'PptParser':
2537 # this is a subfile of a ppt --> to be expected that is no ppt 2537 # this is a subfile of a ppt --> to be expected that is no ppt
2538 log.debug('PPT subfile is not a PPT file') 2538 log.debug('PPT subfile is not a PPT file')
oletools/ppt_parser.py
  View file @22951d1
@@ -40,12 +40,7 @@ import struct @@ -40,12 +40,7 @@ import struct
40 import traceback 40 import traceback
41 import os 41 import os
42 42
43 -try:  
44 - # absolute import when oletools is installed  
45 - import oletools.thirdparty.olefile as olefile  
46 -except:  
47 - # relative import otherwise  
48 - import thirdparty.olefile as olefile 43 +import thirdparty.olefile as olefile
49 44
50 import zlib 45 import zlib
51 46
@@ -1130,7 +1125,7 @@ class PptParser(object): @@ -1130,7 +1125,7 @@ class PptParser(object):
1130 log.debug('using open OleFileIO') 1125 log.debug('using open OleFileIO')
1131 self.ole = ole 1126 self.ole = ole
1132 else: 1127 else:
1133 - log.debug('Opening file ' + ole) 1128 + log.debug('Opening file {0}'.format(ole))
1134 self.ole = olefile.OleFileIO(ole) 1129 self.ole = olefile.OleFileIO(ole)
1135 1130
1136 self.fast_fail = fast_fail 1131 self.fast_fail = fast_fail