TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 01:07:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

gobj: Fix crash when trying to load directory as txo/dds/ktx file

Browse Source
This commit is contained in:
rdb 2022-01-06 11:52:40 +01:00
parent 38488d89a2
commit 340dea5261
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
panda/src/gobj/texture.cxx
View File

@ -3575,6 +3575,12 @@ do_read_txo_file(CData *cdata, const Filename &fullpath) {
}
istream *in = file->open_read_file(true);
if (in == nullptr) {
gobj_cat.error()
<< "Failed to open " << filename << " for reading.\n";
return false;
}
bool success = do_read_txo(cdata, *in, fullpath);
vfs->close_read_file(in);
@ -3630,6 +3636,12 @@ do_read_dds_file(CData *cdata, const Filename &fullpath, bool header_only) {
}
istream *in = file->open_read_file(true);
if (in == nullptr) {
gobj_cat.error()
<< "Failed to open " << filename << " for reading.\n";
return false;
}
bool success = do_read_dds(cdata, *in, fullpath, header_only);
vfs->close_read_file(in);
@ -4310,6 +4322,12 @@ do_read_ktx_file(CData *cdata, const Filename &fullpath, bool header_only) {
}
istream *in = file->open_read_file(true);
if (in == nullptr) {
gobj_cat.error()
<< "Failed to open " << filename << " for reading.\n";
return false;
}
bool success = do_read_ktx(cdata, *in, fullpath, header_only);
vfs->close_read_file(in);