Merge #10587: Net: Fix resource leak in ReadBinaryFile(...)
f2fb132cb
Net: Fix resource leak in ReadBinaryFile(...) (practicalswift)
Tree-SHA512: 879b9334d8bb681fa4b6f96d8ecb54e2a8948065f7be5fe7880131479c813602fc9d4a4314f043e6591e1aed50ffafa7c247362a9cdeb049b0721170e227b89a
This commit is contained in:
commit
de8db47b7f
1 changed files with 3 additions and 1 deletions
|
@ -376,8 +376,10 @@ static std::pair<bool,std::string> ReadBinaryFile(const fs::path &filename, size
|
||||||
while ((n=fread(buffer, 1, sizeof(buffer), f)) > 0) {
|
while ((n=fread(buffer, 1, sizeof(buffer), f)) > 0) {
|
||||||
// Check for reading errors so we don't return any data if we couldn't
|
// Check for reading errors so we don't return any data if we couldn't
|
||||||
// read the entire file (or up to maxsize)
|
// read the entire file (or up to maxsize)
|
||||||
if (ferror(f))
|
if (ferror(f)) {
|
||||||
|
fclose(f);
|
||||||
return std::make_pair(false,"");
|
return std::make_pair(false,"");
|
||||||
|
}
|
||||||
retval.append(buffer, buffer+n);
|
retval.append(buffer, buffer+n);
|
||||||
if (retval.size() > maxsize)
|
if (retval.size() > maxsize)
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue