From 6b30eade315d24f863cbc75912ff65651472e3f4 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Fri, 17 Sep 2021 17:28:28 -0700 Subject: [PATCH] Common: Use 0 as unknown size in GetFileSize(). --- Common/File/FileUtil.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Common/File/FileUtil.cpp b/Common/File/FileUtil.cpp index a9b3498118..307b7b2518 100644 --- a/Common/File/FileUtil.cpp +++ b/Common/File/FileUtil.cpp @@ -813,6 +813,8 @@ uint64_t GetFileSize(FILE *f) { // Should error here. return 0; } + if (size == -1) + return 0; return size; #else #ifdef _WIN32 @@ -835,6 +837,8 @@ uint64_t GetFileSize(FILE *f) { // Should error here. return 0; } + if (size == -1) + return 0; return size; #endif } @@ -1062,7 +1066,7 @@ bool ReadFileToString(bool text_file, const Path &filename, std::string &str) { // Warning: some files, like in /sys/, may return a fixed size like 4096. size_t len = (size_t)File::GetFileSize(f); bool success; - if (len == -1) { + if (len == 0) { size_t totalSize = 1024; size_t totalRead = 0; do {