1 files changed, 16 insertions, 5 deletions
diff --git a/third_party/leveldatabase/env_chromium.cc b/third_party/leveldatabase/env_chromium.cc
index dbd2046..245e2cb 100644
--- a/third_party/leveldatabase/env_chromium.cc
+++ b/third_party/leveldatabase/env_chromium.cc
@@ -30,9 +30,10 @@
 #include "base/win/win_util.h"
 #endif
 
+namespace {
+
 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_ANDROID)
 // The following are glibc-specific
-namespace {
 
 size_t fread_unlocked(void *ptr, size_t size, size_t n, FILE *file) {
   return fread(ptr, size, n, file);
@@ -56,9 +57,19 @@ int fdatasync(int fildes) {
 }
 #endif
 
-}
 #endif
 
+// Wide-char safe fopen wrapper.
+FILE* fopen_internal(const char* fname, const char* mode) {
+#if defined(OS_WIN)
+  return _wfopen(UTF8ToUTF16(fname).c_str(), ASCIIToUTF16(mode).c_str());
+#else
+  return fopen(fname, mode);
+#endif
+}
+
+}  // namespace
+
 namespace leveldb {
 
 namespace {
@@ -174,7 +185,7 @@ class ChromiumRandomAccessFile: public RandomAccessFile {
     *result = Slice(scratch, (r < 0) ? 0 : r);
     if (r < 0) {
       // An error: return a non-ok status
-      s = Status::IOError(filename_, "Could not preform read");
+      s = Status::IOError(filename_, "Could not perform read");
     }
     return s;
   }
@@ -247,7 +258,7 @@ class ChromiumEnv : public Env {
 
   virtual Status NewSequentialFile(const std::string& fname,
                                    SequentialFile** result) {
-    FILE* f = fopen(fname.c_str(), "rb");
+    FILE* f = fopen_internal(fname.c_str(), "rb");
     if (f == NULL) {
       *result = NULL;
       return Status::IOError(fname, strerror(errno));
@@ -275,7 +286,7 @@ class ChromiumEnv : public Env {
   virtual Status NewWritableFile(const std::string& fname,
                                  WritableFile** result) {
     *result = NULL;
-    FILE* f = fopen(fname.c_str(), "wb");
+    FILE* f = fopen_internal(fname.c_str(), "wb");
     if (f == NULL) {
       return Status::IOError(fname, strerror(errno));
     } else {