浏览代码

Merge pull request #2490 from olsoneric/add_null_check_py

Ensure obj is not null before using hasattr
Kim Kulling 6 年之前
父节点
当前提交
04117e1378
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      port/PyAssimp/pyassimp/core.py

+ 2 - 1
port/PyAssimp/pyassimp/core.py

@@ -82,7 +82,8 @@ def call_init(obj, caller = None):
         _init(obj,parent=caller)
         _init(obj,parent=caller)
 
 
 def _is_init_type(obj):
 def _is_init_type(obj):
-    if helper.hasattr_silent(obj,'contents'): #pointer
+
+    if obj and helper.hasattr_silent(obj,'contents'): #pointer
         return _is_init_type(obj[0])
         return _is_init_type(obj[0])
     # null-pointer case that arises when we reach a mesh attribute
     # null-pointer case that arises when we reach a mesh attribute
     # like mBitangents which use mNumVertices rather than mNumBitangents
     # like mBitangents which use mNumVertices rather than mNumBitangents