FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Harden Repo::computeHashForPath

Browse Source 
Check for some error cases in computeHashForPath, since this showed up
in some crash reports.
This commit is contained in:
Automatic Release Builder 2020-09-23 22:08:55 +01:00 committed by James Turner
parent b3fc8deb5c
commit 5e37c2092a
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
simgear/io/HTTPRepository.cxx
View File

@ -985,16 +985,24 @@ HTTPRepository::failure() const
std::string HTTPRepoPrivate::computeHashForPath(const SGPath& p) std::string HTTPRepoPrivate::computeHashForPath(const SGPath& p)
{ {
if (!p.exists()) if (!p.exists())
return std::string(); return {};
sha1nfo info; sha1nfo info;
sha1_init(&info); sha1_init(&info);
char* buf = static_cast<char*>(malloc(1024 * 1024));
const int bufSize = 1024 * 1024;
char* buf = static_cast<char*>(malloc(bufSize));
if (!buf) {
sg_io_exception("Couldn't allocate SHA1 computation buffer");
}
size_t readLen; size_t readLen;
SGBinaryFile f(p); SGBinaryFile f(p);
if (!f.open(SG_IO_IN)) { if (!f.open(SG_IO_IN)) {
free(buf);
throw sg_io_exception("Couldn't open file for compute hash", p); throw sg_io_exception("Couldn't open file for compute hash", p);
} }
while ((readLen = f.read(buf, 1024 * 1024)) > 0) { while ((readLen = f.read(buf, bufSize)) > 0) {
sha1_write(&info, buf, readLen); sha1_write(&info, buf, readLen);
} }