TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 16:20:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

dtoolutil/express: Resolving empty filename should yield no result

Browse Source 
See #1140 - I may revert this if someone can demonstrate a compelling use case (for current directory, you can use "." instead), but it seems to have the potential to cause unintuitive behavior.
This commit is contained in:
rdb 2021-04-09 18:21:36 +02:00
parent 47f35a287c
commit e9e1bb1bc6
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dtool/src/dtoolutil/dSearchPath.cxx
View File

@ -242,6 +242,10 @@ get_directory(size_t n) const {
*/ */
Filename DSearchPath:: Filename DSearchPath::
find_file(const Filename &filename) const { find_file(const Filename &filename) const {
if (filename.empty()) {
return string();
}
if (filename.is_local()) { if (filename.is_local()) {
if (_directories.empty()) { if (_directories.empty()) {
// Let's say an empty search path is the same as a search path // Let's say an empty search path is the same as a search path

4
panda/src/express/virtualFileSystem.cxx
View File

@ -649,6 +649,10 @@ find_file(const Filename &filename, const DSearchPath &searchpath,
return get_file(filename, status_only); return get_file(filename, status_only);
} }
if (filename.empty()) {
return nullptr;
}
int num_directories = searchpath.get_num_directories(); int num_directories = searchpath.get_num_directories();
for (int i = 0; i < num_directories; ++i) { for (int i = 0; i < num_directories; ++i) {
Filename match(searchpath.get_directory(i), filename); Filename match(searchpath.get_directory(i), filename);