summaryrefslogtreecommitdiff
path: root/tools/editor
diff options
context:
space:
mode:
authorHubert Jarosz <marqin.pl+git@gmail.com>2016-02-28 20:37:43 +0100
committerHubert Jarosz <marqin.pl@gmail.com>2016-03-09 00:16:56 +0100
commit19ea9ae1e5ad51e22c32d4f6593e93c7ef58f491 (patch)
treea61beb912be1296aab6d2dfb76e51eccb5715549 /tools/editor
parent96d6a74e25976c64657c5a060494e667d4ab3643 (diff)
fix possible crash in tools/editor/editor_import_export.cpp
da could be NULL, and dereferencing NULL could lead to crash
Diffstat (limited to 'tools/editor')
-rw-r--r--tools/editor/editor_import_export.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/editor/editor_import_export.cpp b/tools/editor/editor_import_export.cpp
index a1fe875287..e02ffd337b 100644
--- a/tools/editor/editor_import_export.cpp
+++ b/tools/editor/editor_import_export.cpp
@@ -281,6 +281,7 @@ static void _edit_filter_list(Set<StringName>& r_list,const String& p_filter,boo
}
DirAccess *da = DirAccess::open("res://");
+ ERR_FAIL_NULL(da);
_edit_files_with_filter(da,filters,r_list,exclude);
memdelete(da);
}
@@ -2217,5 +2218,3 @@ EditorImportExport::~EditorImportExport() {
}
-
-