Merge pull request #66246 from Jummit/fix-dir-crash

Fix crash when listing files in nonexistent directory

1 files changed, 2 insertions, 0 deletions

diff --git a/core/io/dir_access.cpp b/core/io/dir_access.cpp
index f86dfe8057..79e7fa16e3 100644
--- a/core/io/dir_access.cpp
+++ b/core/io/dir_access.cpp
@@ -492,6 +492,7 @@ PackedStringArray DirAccess::get_files() {
 
 PackedStringArray DirAccess::get_files_at(const String &p_path) {
 	Ref<DirAccess> da = DirAccess::open(p_path);
+	ERR_FAIL_COND_V_MSG(da.is_null(), PackedStringArray(), vformat("Couldn't open directory at path \"%s\".", p_path));
 	return da->get_files();
 }
 
@@ -501,6 +502,7 @@ PackedStringArray DirAccess::get_directories() {
 
 PackedStringArray DirAccess::get_directories_at(const String &p_path) {
 	Ref<DirAccess> da = DirAccess::open(p_path);
+	ERR_FAIL_COND_V_MSG(da.is_null(), PackedStringArray(), vformat("Couldn't open directory at path \"%s\".", p_path));
 	return da->get_directories();
 }