summaryrefslogtreecommitdiff
path: root/Source/Core/Common/Src/FileUtil.cpp
diff options
context:
space:
mode:
authorsl1nk3.s <sl1nk3.s@gmail.com>2009-06-12 15:47:41 +0000
committersl1nk3.s <sl1nk3.s@gmail.com>2009-06-12 15:47:41 +0000
commitd99deae17d91b8ae6ad4b677914e78881b58c1e0 (patch)
tree92764da06658e48230646218cb45da99297fec9f /Source/Core/Common/Src/FileUtil.cpp
parenta1fd2defc4626913bdcf1c355e5b66e2d7d7eb46 (diff)
Fix for tatsunoko vs capcom and those wii games getting corrupted memory error
+ a couple of (serious...) fixes for some of my mistakes, and some warning fixes git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3411 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common/Src/FileUtil.cpp')
-rw-r--r--Source/Core/Common/Src/FileUtil.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp
index a98dbce1be..1b476161e7 100644
--- a/Source/Core/Common/Src/FileUtil.cpp
+++ b/Source/Core/Common/Src/FileUtil.cpp
@@ -633,7 +633,7 @@ bool ReadFileToString(bool text_file, const char *filename, std::string &str)
if (!f)
return false;
fseek(f, 0, SEEK_END);
- size_t len = ftell(f);
+ size_t len = (size_t)ftell(f);
fseek(f, 0, SEEK_SET);
char *buf = new char[len + 1];
buf[fread(buf, 1, len, f)] = 0;