Merge remote-tracking branch 'origin/master' into move_operator

This commit is contained in:
Selmar Kok 2019-10-21 17:58:57 +02:00
commit 6f08785e9f

View File

@ -2408,7 +2408,7 @@ bool ReadWholeFile(std::vector<unsigned char> *out, std::string *err,
size_t sz = static_cast<size_t>(f.tellg());
f.seekg(0, f.beg);
if (int(sz) < 0) {
if (int64_t(sz) < 0) {
if (err) {
(*err) += "Invalid file size : " + filepath +
" (does the path point to a directory?)";