autour_de_minuit/blender-asset-tracer
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixed file leak when opening corrupted file.

Browse Source
This commit is contained in:
Sybren A. Stüvel 2018-02-23 14:18:52 +01:00
parent eb8281ea82
commit 9750a91571
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
blender_asset_tracer/blendfile/__init__.py
View File

@ -97,15 +97,19 @@ class BlendFile:
fileobj.close() fileobj.close()
raise exceptions.BlendFileError("File is not a blend file", path) raise exceptions.BlendFileError("File is not a blend file", path)
self.header = header.BlendFileHeader(self.fileobj, self.raw_filepath)
self.block_header_struct = self.header.create_block_header_struct()
self.blocks = [] self.blocks = []
self.code_index = collections.defaultdict(list) self.code_index = collections.defaultdict(list)
self.structs = [] self.structs = []
self.sdna_index_from_id = {} self.sdna_index_from_id = {}
self.block_from_addr = {} self.block_from_addr = {}
self._load_blocks() try:
self.header = header.BlendFileHeader(self.fileobj, self.raw_filepath)
self.block_header_struct = self.header.create_block_header_struct()
self._load_blocks()
except Exception:
fileobj.close()
raise
def _load_blocks(self): def _load_blocks(self):
"""Read the blend file to load its DNA structure to memory.""" """Read the blend file to load its DNA structure to memory."""
@ -304,7 +308,7 @@ class BlendFileBlock:
if len(data) != header_struct.size: if len(data) != header_struct.size:
self.log.warning("Blend file %s seems to be truncated, " self.log.warning("Blend file %s seems to be truncated, "
"expected %d bytes but could read only %d", "expected %d bytes but could read only %d",
header_struct.size, len(data)) bfile.filepath, header_struct.size, len(data))
self.code = b'ENDB' self.code = b'ENDB'
return return

BIN
tests/blendfiles/corrupt_only_magic.blend Normal file
View File

Binary file not shown.

7
tests/test_blendfile_loading.py
View File

@ -1,6 +1,5 @@
import os import os
import pathlib import pathlib
import unittest
from blender_asset_tracer import blendfile from blender_asset_tracer import blendfile
from blender_asset_tracer.blendfile import iterators, exceptions from blender_asset_tracer.blendfile import iterators, exceptions
@ -210,7 +209,11 @@ class LoadCompressedTest(AbstractBlendFileTest):
self.assertEqual('OBümlaut', name) self.assertEqual('OBümlaut', name)
class LoadNonBlendfileTest(unittest.TestCase): class LoadNonBlendfileTest(AbstractBlendFileTest):
def test_loading(self): def test_loading(self):
with self.assertRaises(exceptions.BlendFileError): with self.assertRaises(exceptions.BlendFileError):
blendfile.BlendFile(pathlib.Path(__file__)) blendfile.BlendFile(pathlib.Path(__file__))
def test_no_datablocks(self):
with self.assertRaises(exceptions.NoDNA1Block):
blendfile.BlendFile(self.blendfiles / 'corrupt_only_magic.blend')