Commit 403420318a63ab13d6e4f66bbe8988d8ab150fa3
Committed by
GitHub
GitHub
Merge pull request #288 from enkelli/fix-str-has-no-attrib-decode
Fix AttributeError: 'str' object has no attribute 'decode'.
Showing
1 changed file
with
3 additions
and
1 deletions
oletools/olevba3.py
| @@ -2878,7 +2878,9 @@ class VBA_Parser(object): | @@ -2878,7 +2878,9 @@ class VBA_Parser(object): | ||
| 2878 | self.vba_code_all_modules = '' | 2878 | self.vba_code_all_modules = '' |
| 2879 | for (_, _, _, vba_code) in self.extract_all_macros(): | 2879 | for (_, _, _, vba_code) in self.extract_all_macros(): |
| 2880 | #TODO: filter code? (each module) | 2880 | #TODO: filter code? (each module) |
| 2881 | - self.vba_code_all_modules += vba_code.decode('utf-8', 'ignore') + '\n' | 2881 | + if isinstance(vba_code, bytes): |
| 2882 | + vba_code = vba_code.decode('utf-8', 'ignore') | ||
| 2883 | + self.vba_code_all_modules += vba_code + '\n' | ||
| 2882 | for (_, _, form_string) in self.extract_form_strings(): | 2884 | for (_, _, form_string) in self.extract_form_strings(): |
| 2883 | self.vba_code_all_modules += form_string.decode('utf-8', 'ignore') + '\n' | 2885 | self.vba_code_all_modules += form_string.decode('utf-8', 'ignore') + '\n' |
| 2884 | # Analyze the whole code at once: | 2886 | # Analyze the whole code at once: |