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

don't crash if file doesn't exist or can't be read

Browse Source
This commit is contained in:
David Rose 2002-12-10 23:54:58 +00:00
parent 9d92646a4f
commit 43d278daf6
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
panda/src/express/crypto_utils.cxx
View File

@ -20,8 +20,9 @@
#include "hashVal.h" #include "hashVal.h"
#include "config_express.h"
#include "crypto_utils.h" #include "crypto_utils.h"
#include <md5.h> #include <md5.h>
#include <hex.h> #include <hex.h>
#include <files.h> #include <files.h>
@ -85,8 +86,19 @@ md5_a_file(const Filename &name, HashVal &ret) {
MD5 md5; MD5 md5;
string fs = name.to_os_specific(); string fs = name.to_os_specific();
FileSource f(fs.c_str(), true,
new HashFilter(md5, new HexEncoder(new FileSink(os)))); try {
FileSource f(fs.c_str(), true,
new HashFilter(md5, new HexEncoder(new FileSink(os))));
} catch (...) {
express_cat.warning()
<< "Unable to read " << name << " to compute md5 hash.\n";
ret.hv[0] = 0;
ret.hv[1] = 0;
ret.hv[2] = 0;
ret.hv[3] = 0;
return;
}
istringstream is(os.str()); istringstream is(os.str());