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

load_dso: prevent load_dso_error() from returning old error

Browse Source 
This happens if load_dso fails due to being unable to find the file, but not setting the dlerror flag and therefore causing a misleading error message to be shown.
This commit is contained in:
rdb 2019-01-19 23:10:46 +01:00
parent 7d09451b2d
commit 6eca44464e
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dtool/src/dtoolutil/load_dso.cxx
View File

@ -132,6 +132,9 @@ void *
load_dso(const DSearchPath &path, const Filename &filename) { load_dso(const DSearchPath &path, const Filename &filename) {
Filename abspath = resolve_dso(path, filename); Filename abspath = resolve_dso(path, filename);
if (!abspath.is_regular_file()) { if (!abspath.is_regular_file()) {
// Make sure the error flag is cleared, to prevent a subsequent call to
// load_dso_error() from returning a previously stored error.
dlerror();
return nullptr; return nullptr;
} }
string os_specific = abspath.to_os_specific(); string os_specific = abspath.to_os_specific();