TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-18 12:43:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

loader: fix UB in try_load_file when loading file without known type

Browse Source
This commit is contained in:
rdb 2017-11-23 01:15:44 +01:00
parent 214b67c3c0
commit bec9ff8a40
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/pgraph/loader.cxx
View File

@ -277,7 +277,8 @@ try_load_file(const Filename &pathname, const LoaderOptions &options,
LoaderFileType *requested_type) const { LoaderFileType *requested_type) const {
BamCache *cache = BamCache::get_global_ptr(); BamCache *cache = BamCache::get_global_ptr();
bool allow_ram_cache = requested_type->get_allow_ram_cache(options); bool allow_ram_cache =
((options.get_flags() & LoaderOptions::LF_no_ram_cache) == 0);
if (allow_ram_cache) { if (allow_ram_cache) {
// If we're allowing a RAM cache, use the ModelPool to load the file. // If we're allowing a RAM cache, use the ModelPool to load the file.
@ -298,7 +299,8 @@ try_load_file(const Filename &pathname, const LoaderOptions &options,
bool report_errors = ((options.get_flags() & LoaderOptions::LF_report_errors) != 0 || loader_cat.is_debug()); bool report_errors = ((options.get_flags() & LoaderOptions::LF_report_errors) != 0 || loader_cat.is_debug());
PT(BamCacheRecord) record; PT(BamCacheRecord) record;
if (cache->get_cache_models() && requested_type->get_allow_disk_cache(options)) { if (cache->get_cache_models() &&
(options.get_flags() & LoaderOptions::LF_no_disk_cache) == 0) {
// See if the model can be found in the on-disk cache, if it is active. // See if the model can be found in the on-disk cache, if it is active.
record = cache->lookup(pathname, "bam"); record = cache->lookup(pathname, "bam");
if (record != (BamCacheRecord *)NULL) { if (record != (BamCacheRecord *)NULL) {